version 1.160.6.43, 2014/05/04 22:19:29
|
version 1.160.6.121, 2022/01/19 20:56:06
|
Line 19
|
Line 19
|
# |
# |
# You should have received a copy of the GNU General Public License |
# You should have received a copy of the GNU General Public License |
# along with LON-CAPA; if not, write to the Free Software |
# along with LON-CAPA; if not, write to the Free Software |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA# |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
# |
# /home/httpd/html/adm/gpl.txt |
# /home/httpd/html/adm/gpl.txt |
# |
# |
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
Line 173 use File::Copy;
|
Line 174 use File::Copy;
|
use Locale::Language; |
use Locale::Language; |
use DateTime::TimeZone; |
use DateTime::TimeZone; |
use DateTime::Locale; |
use DateTime::Locale; |
|
use Net::CIDR; |
|
|
my $registered_cleanup; |
my $registered_cleanup; |
my $modified_urls; |
my $modified_urls; |
Line 213 sub handler {
|
Line 215 sub handler {
|
'quotas','autoenroll','autoupdate','autocreate', |
'quotas','autoenroll','autoupdate','autocreate', |
'directorysrch','usercreation','usermodification', |
'directorysrch','usercreation','usermodification', |
'contacts','defaults','scantron','coursecategories', |
'contacts','defaults','scantron','coursecategories', |
'serverstatuses','requestcourses','coursedefaults', |
'serverstatuses','requestcourses','helpsettings', |
'usersessions','loadbalancing','requestauthor', |
'coursedefaults','usersessions','loadbalancing', |
'selfenrollment','inststatus'],$dom); |
'requestauthor','selfenrollment','inststatus', |
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
'passwords','wafproxy','ipaccess'],$dom); |
'autoupdate','autocreate','directorysrch','contacts', |
my @prefs_order = ('rolecolors','login','ipaccess','defaults','wafproxy','passwords', |
'usercreation','selfcreation','usermodification','scantron', |
'quotas','autoenroll','autoupdate','autocreate','directorysrch', |
'requestcourses','requestauthor','coursecategories', |
'contacts','usercreation','selfcreation','usermodification', |
'serverstatuses','coursedefaults','selfenrollment', |
'scantron','requestcourses','requestauthor','coursecategories', |
'usersessions'); |
'serverstatuses','helpsettings','coursedefaults', |
|
'selfenrollment','usersessions'); |
my %existing; |
my %existing; |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
%existing = %{$domconfig{'loadbalancing'}}; |
%existing = %{$domconfig{'loadbalancing'}}; |
Line 250 sub handler {
|
Line 253 sub handler {
|
header => [{col1 => 'Log-in Page Items', |
header => [{col1 => 'Log-in Page Items', |
col2 => '',}, |
col2 => '',}, |
{col1 => 'Log-in Help', |
{col1 => 'Log-in Help', |
col2 => 'Value'}], |
col2 => 'Value'}, |
|
{col1 => 'Custom HTML in document head', |
|
col2 => 'Value'}, |
|
{col1 => 'SSO', |
|
col2 => 'Dual login: SSO and non-SSO options'}, |
|
], |
print => \&print_login, |
print => \&print_login, |
modify => \&modify_login, |
modify => \&modify_login, |
}, |
}, |
Line 260 sub handler {
|
Line 268 sub handler {
|
header => [{col1 => 'Setting', |
header => [{col1 => 'Setting', |
col2 => 'Value'}, |
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, |
}, |
}, |
|
'wafproxy' => |
|
{ text => 'Web Application Firewall/Reverse Proxy', |
|
help => 'Domain_Configuration_WAF_Proxy', |
|
header => [{col1 => 'Domain(s)', |
|
col2 => 'Servers and WAF/Reverse Proxy alias(es)', |
|
}, |
|
{col1 => 'Domain(s)', |
|
col2 => 'WAF Configuration',}], |
|
print => \&print_wafproxy, |
|
modify => \&modify_wafproxy, |
|
}, |
|
'passwords' => |
|
{ text => 'Passwords (Internal authentication)', |
|
help => 'Domain_Configuration_Passwords', |
|
header => [{col1 => 'Resetting Forgotten Password', |
|
col2 => 'Settings'}, |
|
{col1 => 'Encryption of Stored Passwords (Internal Auth)', |
|
col2 => 'Settings'}, |
|
{col1 => 'Rules for LON-CAPA Passwords', |
|
col2 => 'Settings'}, |
|
{col1 => 'Course Owner Changing Student Passwords', |
|
col2 => 'Settings'}], |
|
print => \&print_passwords, |
|
modify => \&modify_passwords, |
|
}, |
'quotas' => |
'quotas' => |
{ text => 'Blogs, personal web pages, webDAV/quotas, portfolios', |
{ text => 'Blogs, personal web pages, webDAV/quotas, portfolios', |
help => 'Domain_Configuration_Quotas', |
help => 'Domain_Configuration_Quotas', |
Line 302 sub handler {
|
Line 335 sub handler {
|
modify => \&modify_autocreate, |
modify => \&modify_autocreate, |
}, |
}, |
'directorysrch' => |
'directorysrch' => |
{ text => 'Institutional directory searches', |
{ text => 'Directory searches', |
help => 'Domain_Configuration_InstDirectory_Search', |
help => 'Domain_Configuration_InstDirectory_Search', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Institutional Directory Setting', |
|
col2 => 'Value',}, |
|
{col1 => 'LON-CAPA Directory Setting', |
col2 => 'Value',}], |
col2 => 'Value',}], |
print => \&print_directorysrch, |
print => \&print_directorysrch, |
modify => \&modify_directorysrch, |
modify => \&modify_directorysrch, |
}, |
}, |
'contacts' => |
'contacts' => |
{ text => 'Contact Information', |
{ text => 'E-mail addresses and helpform', |
help => 'Domain_Configuration_Contact_Info', |
help => 'Domain_Configuration_Contact_Info', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Default e-mail addresses', |
col2 => 'Value',}], |
col2 => 'Value',}, |
|
{col1 => 'Recipient(s) for notifications', |
|
col2 => 'Value',}, |
|
{col1 => 'Nightly status check e-mail', |
|
col2 => 'Settings',}, |
|
{col1 => 'Ask helpdesk form settings', |
|
col2 => 'Value',},], |
print => \&print_contacts, |
print => \&print_contacts, |
modify => \&modify_contacts, |
modify => \&modify_contacts, |
}, |
}, |
Line 336 sub handler {
|
Line 377 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 352 sub handler {
|
Line 393 sub handler {
|
modify => \&modify_usermodification, |
modify => \&modify_usermodification, |
}, |
}, |
'scantron' => |
'scantron' => |
{ text => 'Bubblesheet format file', |
{ text => 'Bubblesheet format', |
help => 'Domain_Configuration_Scantron_Format', |
help => 'Domain_Configuration_Scantron_Format', |
header => [ {col1 => 'Item', |
header => [ {col1 => 'Bubblesheet format file', |
col2 => '', |
col2 => ''}, |
}], |
{col1 => 'Bubblesheet data upload formats', |
|
col2 => 'Settings'}], |
print => \&print_scantron, |
print => \&print_scantron, |
modify => \&modify_scantron, |
modify => \&modify_scantron, |
}, |
}, |
Line 369 sub handler {
|
Line 411 sub handler {
|
col2 => 'Value'}, |
col2 => 'Value'}, |
{col1 => 'Available textbooks', |
{col1 => 'Available textbooks', |
col2 => ''}, |
col2 => ''}, |
|
{col1 => 'Available templates', |
|
col2 => ''}, |
{col1 => 'Validation (not official courses)', |
{col1 => 'Validation (not official courses)', |
col2 => 'Value'},], |
col2 => 'Value'},], |
print => \&print_quotas, |
print => \&print_quotas, |
Line 407 sub handler {
|
Line 451 sub handler {
|
print => \&print_serverstatuses, |
print => \&print_serverstatuses, |
modify => \&modify_serverstatuses, |
modify => \&modify_serverstatuses, |
}, |
}, |
|
'helpsettings' => |
|
{text => 'Support settings', |
|
help => 'Domain_Configuration_Help_Settings', |
|
header => [{col1 => 'Help Page Settings (logged-in users)', |
|
col2 => 'Value'}, |
|
{col1 => 'Helpdesk Roles', |
|
col2 => 'Settings'},], |
|
print => \&print_helpsettings, |
|
modify => \&modify_helpsettings, |
|
}, |
'coursedefaults' => |
'coursedefaults' => |
{text => 'Course/Community defaults', |
{text => 'Course/Community defaults', |
help => 'Domain_Configuration_Course_Defaults', |
help => 'Domain_Configuration_Course_Defaults', |
Line 441 sub handler {
|
Line 495 sub handler {
|
print => \&print_usersessions, |
print => \&print_usersessions, |
modify => \&modify_usersessions, |
modify => \&modify_usersessions, |
}, |
}, |
'loadbalancing' => |
'loadbalancing' => |
{text => 'Dedicated Load Balancer(s)', |
{text => 'Dedicated Load Balancer(s)', |
help => 'Domain_Configuration_Load_Balancing', |
help => 'Domain_Configuration_Load_Balancing', |
header => [{col1 => 'Balancers', |
header => [{col1 => 'Balancers', |
Line 452 sub handler {
|
Line 506 sub handler {
|
print => \&print_loadbalancing, |
print => \&print_loadbalancing, |
modify => \&modify_loadbalancing, |
modify => \&modify_loadbalancing, |
}, |
}, |
|
'ipaccess' => |
|
{text => 'IP-based access control', |
|
help => 'Domain_Configuration_IP_Access', |
|
header => [{col1 => 'Setting', |
|
col2 => 'Value'},], |
|
print => \&print_ipaccess, |
|
modify => \&modify_ipaccess, |
|
}, |
); |
); |
if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
$prefs{'login'} = { text => 'Log-in page options', |
$prefs{'login'} = { text => 'Log-in page options', |
Line 461 sub handler {
|
Line 523 sub handler {
|
{col1 => 'Log-in Page Items', |
{col1 => 'Log-in Page Items', |
col2 => ''}, |
col2 => ''}, |
{col1 => 'Log-in Help', |
{col1 => 'Log-in Help', |
col2 => 'Value'}], |
col2 => 'Value'}, |
|
{col1 => 'Custom HTML in document head', |
|
col2 => 'Value'}, |
|
{col1 => 'SSO', |
|
col2 => 'Dual login: SSO and non-SSO options'}, |
|
], |
print => \&print_login, |
print => \&print_login, |
modify => \&modify_login, |
modify => \&modify_login, |
}; |
}; |
Line 502 $javascript_validations
|
Line 569 $javascript_validations
|
</script> |
</script> |
$coursebrowserjs |
$coursebrowserjs |
END |
END |
|
} elsif (grep(/^ipaccess$/,@actions)) { |
|
$js .= &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}); |
|
} |
|
if (grep(/^selfcreation$/,@actions)) { |
|
$js .= &selfcreate_javascript(); |
|
} |
|
if (grep(/^contacts$/,@actions)) { |
|
$js .= &contacts_javascript(); |
|
} |
|
if (grep(/^scantron$/,@actions)) { |
|
$js .= &scantron_javascript(); |
} |
} |
&Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js); |
&Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js); |
} else { |
} else { |
Line 592 sub process_changes {
|
Line 670 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 613 sub process_changes {
|
Line 691 sub process_changes {
|
$output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig); |
$output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig); |
} elsif ($action eq 'requestauthor') { |
} elsif ($action eq 'requestauthor') { |
$output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig); |
$output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig); |
|
} elsif ($action eq 'helpsettings') { |
|
$output = &modify_helpsettings($r,$dom,$confname,$lastactref,%domconfig); |
} elsif ($action eq 'coursedefaults') { |
} elsif ($action eq 'coursedefaults') { |
$output = &modify_coursedefaults($dom,$lastactref,%domconfig); |
$output = &modify_coursedefaults($dom,$lastactref,%domconfig); |
} elsif ($action eq 'selfenrollment') { |
} elsif ($action eq 'selfenrollment') { |
Line 621 sub process_changes {
|
Line 701 sub process_changes {
|
$output = &modify_usersessions($dom,$lastactref,%domconfig); |
$output = &modify_usersessions($dom,$lastactref,%domconfig); |
} elsif ($action eq 'loadbalancing') { |
} elsif ($action eq 'loadbalancing') { |
$output = &modify_loadbalancing($dom,%domconfig); |
$output = &modify_loadbalancing($dom,%domconfig); |
|
} elsif ($action eq 'passwords') { |
|
$output = &modify_passwords($r,$dom,$confname,$lastactref,%domconfig); |
|
} elsif ($action eq 'wafproxy') { |
|
$output = &modify_wafproxy($dom,$action,$lastactref,%domconfig); |
|
} elsif ($action eq 'ipaccess') { |
|
$output = &modify_ipaccess($dom,$lastactref,%domconfig); |
} |
} |
return $output; |
return $output; |
} |
} |
Line 633 sub print_config_box {
|
Line 719 sub print_config_box {
|
$output = &coursecategories_javascript($settings); |
$output = &coursecategories_javascript($settings); |
} elsif ($action eq 'defaults') { |
} elsif ($action eq 'defaults') { |
$output = &defaults_javascript($settings); |
$output = &defaults_javascript($settings); |
|
} elsif ($action eq 'passwords') { |
|
$output = &passwords_javascript(); |
|
} elsif ($action eq 'helpsettings') { |
|
my (%privs,%levelscurrent); |
|
my %full=(); |
|
my %levels=( |
|
course => {}, |
|
domain => {}, |
|
system => {}, |
|
); |
|
my $context = 'domain'; |
|
my $crstype = 'Course'; |
|
my $formname = 'display'; |
|
&Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent); |
|
my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype); |
|
$output = |
|
&Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,\%full, |
|
\@templateroles); |
|
} elsif ($action eq 'wafproxy') { |
|
$output .= &wafproxy_javascript($dom); |
|
} elsif ($action eq 'autoupdate') { |
|
$output .= &autoupdate_javascript(); |
|
} elsif ($action eq 'autoenroll') { |
|
$output .= &autoenroll_javascript(); |
|
} elsif ($action eq 'login') { |
|
$output .= &saml_javascript(); |
|
} elsif ($action eq 'ipaccess') { |
|
$output .= &ipaccess_javascript($settings); |
} |
} |
$output .= |
$output .= |
'<table class="LC_nested_outer"> |
'<table class="LC_nested_outer"> |
<tr> |
<tr> |
<th align="left" valign="middle"><span class="LC_nobreak">'. |
<th class="LC_left_item LC_middle"><span class="LC_nobreak">'. |
&mt($item->{text}).' '. |
&mt($item->{text}).' '. |
&Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n". |
&Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n". |
'</tr>'; |
'</tr>'; |
Line 649 sub print_config_box {
|
Line 763 sub print_config_box {
|
if ($numheaders > 1) { |
if ($numheaders > 1) { |
my $colspan = ''; |
my $colspan = ''; |
my $rightcolspan = ''; |
my $rightcolspan = ''; |
|
my $leftnobr = ''; |
if (($action eq 'rolecolors') || ($action eq 'defaults') || |
if (($action eq 'rolecolors') || ($action eq 'defaults') || |
(($action eq 'login') && ($numheaders < 3))) { |
($action eq 'directorysrch') || |
|
(($action eq 'login') && ($numheaders < 5))) { |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
} |
} |
if ($action eq 'usersessions') { |
if ($action eq 'usersessions') { |
$rightcolspan = ' colspan="3"'; |
$rightcolspan = ' colspan="3"'; |
} |
} |
|
if ($action eq 'passwords') { |
|
$leftnobr = ' LC_nobreak'; |
|
} |
$output .= ' |
$output .= ' |
<tr> |
<tr> |
<td> |
<td> |
<table class="LC_nested"> |
<table class="LC_nested"> |
<tr class="LC_info_row"> |
<tr class="LC_info_row"> |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[0]->{'col1'}).'</td> |
<td class="LC_left_item'.$leftnobr.'"'.$colspan.'>'.&mt($item->{'header'}->[0]->{'col1'}).'</td> |
<td class="LC_right_item"'.$rightcolspan.'>'.&mt($item->{'header'}->[0]->{'col2'}).'</td> |
<td class="LC_right_item"'.$rightcolspan.'>'.&mt($item->{'header'}->[0]->{'col2'}).'</td> |
</tr>'; |
</tr>'; |
$rowtotal ++; |
$rowtotal ++; |
if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') || |
if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') || |
($action eq 'usermodification') || ($action eq 'defaults') || |
($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') || |
($action eq 'selfenrollment') || ($action eq 'usersessions')) { |
($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'directorysrch') || |
|
($action eq 'helpsettings') || ($action eq 'contacts') || ($action eq 'wafproxy')) { |
$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); |
|
} elsif ($action eq 'passwords') { |
|
$output .= $item->{'print'}->('top',$dom,$confname,$settings,\$rowtotal); |
} elsif ($action eq 'coursecategories') { |
} elsif ($action eq 'coursecategories') { |
$output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal); |
|
} elsif ($action eq 'scantron') { |
|
$output .= $item->{'print'}->($r,'top',$dom,$confname,$settings,\$rowtotal); |
} elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
if ($numheaders == 3) { |
if ($numheaders == 5) { |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
$output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal); |
$output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal); |
} else { |
} else { |
Line 697 sub print_config_box {
|
Line 821 sub print_config_box {
|
$rowtotal ++; |
$rowtotal ++; |
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 'contacts') || ($action eq 'passwords')) { |
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"'; |
|
} elsif ($action eq 'passwords') { |
|
$output .= $item->{'print'}->('middle',$dom,$confname,$settings,\$rowtotal); |
} else { |
} else { |
$output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal); |
} |
} |
Line 717 sub print_config_box {
|
Line 844 sub print_config_box {
|
</tr>'."\n"; |
</tr>'."\n"; |
if ($action eq 'coursecategories') { |
if ($action eq 'coursecategories') { |
$output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); |
$output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); |
|
} elsif (($action eq 'contacts') || ($action eq 'passwords')) { |
|
if ($action eq 'passwords') { |
|
$output .= $item->{'print'}->('lower',$dom,$confname,$settings,\$rowtotal); |
|
} else { |
|
$output .= $item->{'print'}->('lower',$dom,$settings,\$rowtotal); |
|
} |
|
$output .= ' |
|
</tr> |
|
</table> |
|
</td> |
|
</tr> |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row"> |
|
<td class="LC_left_item'.$leftnobr.'"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'."\n"; |
|
if ($action eq 'passwords') { |
|
$output .= $item->{'print'}->('bottom',$dom,$confname,$settings,\$rowtotal); |
|
} else { |
|
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
|
} |
|
$output .= ' |
|
</table> |
|
</td> |
|
</tr> |
|
<tr>'; |
} else { |
} else { |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
} |
} |
$rowtotal ++; |
$rowtotal ++; |
} elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') || |
} elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') || |
($action eq 'defaults')) { |
($action eq 'defaults') || ($action eq 'directorysrch') || |
|
($action eq 'helpsettings') || ($action eq 'wafproxy')) { |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
|
} elsif ($action eq 'scantron') { |
|
$output .= $item->{'print'}->($r,'bottom',$dom,$confname,$settings,\$rowtotal); |
} elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
if ($numheaders == 3) { |
if ($numheaders == 5) { |
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
</table> |
</table> |
</td> |
</td> |
Line 741 sub print_config_box {
|
Line 898 sub print_config_box {
|
} else { |
} else { |
$output .= &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal); |
$output .= &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal); |
} |
} |
|
$output .= ' |
|
</table> |
|
</td> |
|
</tr> |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row">'; |
|
if ($numheaders == 5) { |
|
$output .= ' |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td> |
|
</tr>'; |
|
} else { |
|
$output .= ' |
|
<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>'; |
|
} |
|
$rowtotal ++; |
|
$output .= &print_login('headtag',$dom,$confname,$phase,$settings,\$rowtotal).' |
|
</table> |
|
</td> |
|
</tr> |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row">'; |
|
if ($numheaders == 5) { |
|
$output .= ' |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[4]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[4]->{'col2'}).'</td> |
|
</tr>'; |
|
} else { |
|
$output .= ' |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td> |
|
</tr>'; |
|
} |
|
$rowtotal ++; |
|
$output .= &print_login('saml',$dom,$confname,$phase,$settings,\$rowtotal); |
} elsif ($action eq 'requestcourses') { |
} elsif ($action eq 'requestcourses') { |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal). |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
&print_studentcode($settings,\$rowtotal).' |
$rowtotal ++; |
|
$output .= &print_studentcode($settings,\$rowtotal).' |
</table> |
</table> |
</td> |
</td> |
</tr> |
</tr> |
Line 753 sub print_config_box {
|
Line 952 sub print_config_box {
|
<tr class="LC_info_row"> |
<tr class="LC_info_row"> |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
<td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> </tr>'. |
<td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> </tr>'. |
&print_textbookcourses($dom,$settings,\$rowtotal).' |
&textbookcourses_javascript($settings). |
|
&print_textbookcourses($dom,'textbooks',$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">'.&mt($item->{'header'}->[3]->{'col2'}).'</td> </tr>'. |
|
&print_textbookcourses($dom,'templates',$settings,\$rowtotal).' |
</table> |
</table> |
</td> |
</td> |
</tr> |
</tr> |
Line 761 sub print_config_box {
|
Line 971 sub print_config_box {
|
<td> |
<td> |
<table class="LC_nested"> |
<table class="LC_nested"> |
<tr class="LC_info_row"> |
<tr class="LC_info_row"> |
<td class="LC_left_item"'.$colspan.' valign="top">'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
<td class="LC_left_item"'.$colspan.' valign="top">'.&mt($item->{'header'}->[4]->{'col1'}).'</td> |
<td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[3]->{'col2'}).'</td> |
<td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[4]->{'col2'}).'</td> |
</tr>'. |
</tr>'. |
&print_validation_rows('requestcourses',$dom,$settings,\$rowtotal); |
&print_validation_rows('requestcourses',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'requestauthor') { |
} elsif ($action eq 'requestauthor') { |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
|
$rowtotal ++; |
} elsif ($action eq 'rolecolors') { |
} elsif ($action eq 'rolecolors') { |
$output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).' |
$output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).' |
</table> |
</table> |
Line 801 sub print_config_box {
|
Line 1012 sub print_config_box {
|
<td> |
<td> |
<table class="LC_nested"> |
<table class="LC_nested"> |
<tr class="LC_info_row">'; |
<tr class="LC_info_row">'; |
if (($action eq 'login') || ($action eq 'directorysrch')) { |
if ($action eq 'login') { |
$output .= ' |
$output .= ' |
<td class="LC_left_item" colspan="2">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>'; |
<td class="LC_left_item" colspan="2">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>'; |
} elsif ($action eq 'serverstatuses') { |
} elsif ($action eq 'serverstatuses') { |
Line 845 sub print_config_box {
|
Line 1056 sub print_config_box {
|
$rowtotal ++; |
$rowtotal ++; |
if ($action eq 'quotas') { |
if ($action eq 'quotas') { |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
} elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || ($action eq 'directorysrch') || |
} elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || |
($action eq 'contacts') || ($action eq 'serverstatuses') || ($action eq 'loadbalancing')) { |
($action eq 'serverstatuses') || ($action eq 'loadbalancing') || |
|
($action eq 'ipaccess')) { |
$output .= $item->{'print'}->($dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->($dom,$settings,\$rowtotal); |
} elsif ($action eq 'scantron') { |
|
$output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal); |
|
} elsif ($action eq 'helpsettings') { |
|
$output .= &print_helpsettings($dom,$confname,$settings,\$rowtotal); |
|
} |
} |
} |
} |
$output .= ' |
$output .= ' |
Line 864 sub print_config_box {
|
Line 1072 sub print_config_box {
|
|
|
sub print_login { |
sub print_login { |
my ($caller,$dom,$confname,$phase,$settings,$rowtotal) = @_; |
my ($caller,$dom,$confname,$phase,$settings,$rowtotal) = @_; |
my ($css_class,$datatable); |
my ($css_class,$datatable,$switchserver,%lt); |
my %choices = &login_choices(); |
my %choices = &login_choices(); |
|
if (($caller eq 'help') || ($caller eq 'headtag') || ($caller eq 'saml')) { |
|
%lt = &login_file_options(); |
|
$switchserver = &check_switchserver($dom,$confname); |
|
} |
|
|
if ($caller eq 'service') { |
if ($caller eq 'service') { |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
Line 953 sub print_login {
|
Line 1165 sub print_login {
|
} |
} |
} |
} |
my @images = ('img','logo','domlogo','login'); |
my @images = ('img','logo','domlogo','login'); |
|
my @alttext = ('img','logo','domlogo'); |
my @logintext = ('textcol','bgcol'); |
my @logintext = ('textcol','bgcol'); |
my @bgs = ('pgbg','mainbg','sidebg'); |
my @bgs = ('pgbg','mainbg','sidebg'); |
my @links = ('link','alink','vlink'); |
my @links = ('link','alink','vlink'); |
Line 994 sub print_login {
|
Line 1207 sub print_login {
|
$designs{'showlogo'}{$item} = $settings->{'showlogo'}{$item}; |
$designs{'showlogo'}{$item} = $settings->{'showlogo'}{$item}; |
} |
} |
} |
} |
|
foreach my $item (@alttext) { |
|
if (ref($settings->{'alttext'}) eq 'HASH') { |
|
if ($settings->{'alttext'}->{$item} ne '') { |
|
$designs{'alttext'}{$item} = $settings->{'alttext'}{$item}; |
|
} |
|
} |
|
} |
foreach my $item (@logintext) { |
foreach my $item (@logintext) { |
if ($settings->{$item} ne '') { |
if ($settings->{$item} ne '') { |
$designs{'logintext'}{$item} = $settings->{$item}; |
$designs{'logintext'}{$item} = $settings->{$item}; |
Line 1060 sub print_login {
|
Line 1280 sub print_login {
|
$datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext); |
$datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext); |
$datatable .= '</tr></table></td></tr>'; |
$datatable .= '</tr></table></td></tr>'; |
} elsif ($caller eq 'help') { |
} elsif ($caller eq 'help') { |
my ($defaulturl,$defaulttype,%url,%type,%lt,%langchoices); |
my ($defaulturl,$defaulttype,%url,%type,%langchoices); |
my $switchserver = &check_switchserver($dom,$confname); |
|
my $itemcount = 1; |
my $itemcount = 1; |
$defaulturl = '/adm/loginproblems.html'; |
$defaulturl = '/adm/loginproblems.html'; |
$defaulttype = 'default'; |
$defaulttype = 'default'; |
%lt = &Apache::lonlocal::texthash ( |
|
del => 'Delete?', |
|
rep => 'Replace:', |
|
upl => 'Upload:', |
|
default => 'Default', |
|
custom => 'Custom', |
|
); |
|
%langchoices = &Apache::lonlocal::texthash(&get_languages_hash()); |
%langchoices = &Apache::lonlocal::texthash(&get_languages_hash()); |
my @currlangs; |
my @currlangs; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
Line 1148 sub print_login {
|
Line 1360 sub print_login {
|
$itemcount ++; |
$itemcount ++; |
} |
} |
$datatable .= &captcha_choice('login',$settings,$itemcount); |
$datatable .= &captcha_choice('login',$settings,$itemcount); |
|
} elsif ($caller eq 'headtag') { |
|
my %domservers = &Apache::lonnet::get_servers($dom); |
|
my $choice = $choices{'headtag'}; |
|
$css_class = ' class="LC_odd_row"'; |
|
$datatable .= '<tr'.$css_class.'><td colspan="2">'.$choice.'</td>'. |
|
'<td align="left"><table><tr><th>'.$choices{'hostid'}.'</th>'. |
|
'<th>'.$choices{'current'}.'</th>'. |
|
'<th>'.$choices{'action'}.'</th>'. |
|
'<th>'.$choices{'exempt'}.'</th></tr>'."\n"; |
|
my (%currurls,%currexempt); |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{'headtag'}) eq 'HASH') { |
|
foreach my $lonhost (keys(%{$settings->{'headtag'}})) { |
|
if (ref($settings->{'headtag'}{$lonhost}) eq 'HASH') { |
|
$currurls{$lonhost} = $settings->{'headtag'}{$lonhost}{'url'}; |
|
$currexempt{$lonhost} = $settings->{'headtag'}{$lonhost}{'exempt'}; |
|
} |
|
} |
|
} |
|
} |
|
foreach my $lonhost (sort(keys(%domservers))) { |
|
my $exempt = &check_exempt_addresses($currexempt{$lonhost}); |
|
$datatable .= '<tr><td>'.$domservers{$lonhost}.'</td>'; |
|
if ($currurls{$lonhost}) { |
|
$datatable .= '<td class="LC_right_item"><a href="'. |
|
"javascript:void(open('$currurls{$lonhost}?inhibitmenu=yes','Custom_HeadTag', |
|
'menubar=0,toolbar=1,scrollbars=1,width=600,height=500,resizable=yes'))". |
|
'">'.$lt{'curr'}.'</a></td>'. |
|
'<td><span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="loginheadtag_del" value="'.$lonhost.'" />'. |
|
$lt{'del'}.'</label> '.$lt{'rep'}.'</span>'; |
|
} else { |
|
$datatable .= '<td class="LC_right_item">'.$lt{'none'}.'</td><td>'.$lt{'upl'}; |
|
} |
|
$datatable .='<br />'; |
|
if ($switchserver) { |
|
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
|
} else { |
|
$datatable .= '<input type="file" name="loginheadtag_'.$lonhost.'" />'; |
|
} |
|
$datatable .= '</td><td><input type="text" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>'; |
|
} |
|
$datatable .= '</table></td></tr>'; |
|
} elsif ($caller eq 'saml') { |
|
my %domservers = &Apache::lonnet::get_servers($dom); |
|
$datatable .= '<tr><td colspan="3" style="text-align: left">'. |
|
'<table><tr><th>'.$choices{'hostid'}.'</th>'. |
|
'<th>'.$choices{'samllanding'}.'</th>'. |
|
'<th>'.$choices{'samloptions'}.'</th></tr>'."\n"; |
|
my (%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlnotsso,%styleon,%styleoff); |
|
foreach my $lonhost (keys(%domservers)) { |
|
$samlurl{$lonhost} = '/adm/sso'; |
|
$styleon{$lonhost} = 'display:none'; |
|
$styleoff{$lonhost} = ''; |
|
} |
|
if (ref($settings->{'saml'}) eq 'HASH') { |
|
foreach my $lonhost (keys(%{$settings->{'saml'}})) { |
|
if (ref($settings->{'saml'}{$lonhost}) eq 'HASH') { |
|
$saml{$lonhost} = 1; |
|
$samltext{$lonhost} = $settings->{'saml'}{$lonhost}{'text'}; |
|
$samlimg{$lonhost} = $settings->{'saml'}{$lonhost}{'img'}; |
|
$samlalt{$lonhost} = $settings->{'saml'}{$lonhost}{'alt'}; |
|
$samlurl{$lonhost} = $settings->{'saml'}{$lonhost}{'url'}; |
|
$samltitle{$lonhost} = $settings->{'saml'}{$lonhost}{'title'}; |
|
$samlnotsso{$lonhost} = $settings->{'saml'}{$lonhost}{'notsso'}; |
|
$styleon{$lonhost} = ''; |
|
$styleoff{$lonhost} = 'display:none'; |
|
} else { |
|
$styleon{$lonhost} = 'display:none'; |
|
$styleoff{$lonhost} = ''; |
|
} |
|
} |
|
} |
|
my $itemcount = 1; |
|
foreach my $lonhost (sort(keys(%domservers))) { |
|
my $samlon = ' '; |
|
my $samloff = ' checked="checked" '; |
|
if ($saml{$lonhost}) { |
|
$samlon = $samloff; |
|
$samloff = ' '; |
|
} |
|
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.$domservers{$lonhost}.'</span></td>'. |
|
'<td><span class="LC_nobreak"><label><input type="radio" name="saml_'.$lonhost.'"'.$samloff. |
|
'onclick="toggleSamlOptions(this.form,'."'$lonhost'".');" value="0" />'. |
|
&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="saml_'.$lonhost.'"'.$samlon. |
|
'onclick="toggleSamlOptions(this.form,'."'$lonhost'".');" value="1" />'. |
|
&mt('Yes').'</label></span></td>'. |
|
'<td id="samloptionson_'.$lonhost.'" style="'.$styleon{$lonhost}.'" width="100%">'. |
|
'<table><tr><th colspan="5" align="center">'.&mt('SSO').'</th><th align="center">'. |
|
'<span class="LC_nobreak">'.&mt('Non-SSO').'</span></th></tr>'. |
|
'<tr><th>'.&mt('Text').'</th><th>'.&mt('Image').'</th>'. |
|
'<th>'.&mt('Alt Text').'</th><th>'.&mt('URL').'</th>'. |
|
'<th>'.&mt('Tool Tip').'</th><th>'.&mt('Text').'</th></tr>'. |
|
'<tr'.$css_class.'><td><input type="text" name="saml_text_'.$lonhost.'" size="8" value="'. |
|
$samltext{$lonhost}.'" /></td><td>'; |
|
if ($samlimg{$lonhost}) { |
|
$datatable .= '<img src="'.$samlimg{$lonhost}.'" /><br />'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="saml_img_del" value="'.$lonhost.'" />'. |
|
$lt{'del'}.'</label> '.$lt{'rep'}.'</span>'; |
|
} else { |
|
$datatable .= $lt{'upl'}; |
|
} |
|
$datatable .='<br />'; |
|
if ($switchserver) { |
|
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
|
} else { |
|
$datatable .= '<input type="file" name="saml_img_'.$lonhost.'" />'; |
|
} |
|
$datatable .= '</td>'. |
|
'<td><input type="text" name="saml_alt_'.$lonhost.'" size="20" '. |
|
'value="'.$samlalt{$lonhost}.'" /></td>'. |
|
'<td><input type="text" name="saml_url_'.$lonhost.'" size="8" '. |
|
'value="'.$samlurl{$lonhost}.'" /></td>'. |
|
'<td><textarea name="saml_title_'.$lonhost.'" rows="3" cols="15">'. |
|
$samltitle{$lonhost}.'</textarea></td>'. |
|
'<td><input type="text" name="saml_notsso_'.$lonhost.'" size="8" '. |
|
'value="'.$samlnotsso{$lonhost}.'" /></td></tr>'. |
|
'</table></td>'. |
|
'<td id="samloptionsoff_'.$lonhost.'" style="'.$styleoff{$lonhost}.'" width="100%"> </td></tr>'; |
|
$itemcount ++; |
|
} |
|
$datatable .= '</table></td></tr>'; |
} |
} |
return $datatable; |
return $datatable; |
} |
} |
Line 1181 sub login_choices {
|
Line 1518 sub login_choices {
|
link => "Link", |
link => "Link", |
alink => "Active link", |
alink => "Active link", |
vlink => "Visited link", |
vlink => "Visited link", |
|
headtag => "Custom markup", |
|
action => "Action", |
|
current => "Current", |
|
samllanding => "Dual login?", |
|
samloptions => "Options", |
|
alttext => "Alt text", |
); |
); |
return %choices; |
return %choices; |
} |
} |
|
|
|
sub login_file_options { |
|
return &Apache::lonlocal::texthash( |
|
del => 'Delete?', |
|
rep => 'Replace:', |
|
upl => 'Upload:', |
|
curr => 'View contents', |
|
default => 'Default', |
|
custom => 'Custom', |
|
none => 'None', |
|
); |
|
} |
|
|
|
sub print_ipaccess { |
|
my ($dom,$settings,$rowtotal) = @_; |
|
my $css_class; |
|
my $itemcount = 0; |
|
my $datatable; |
|
my %ordered; |
|
if (ref($settings) eq 'HASH') { |
|
foreach my $item (keys(%{$settings})) { |
|
if (ref($settings->{$item}) eq 'HASH') { |
|
my $num = $settings->{$item}{'order'}; |
|
if ($num eq '') { |
|
$num = scalar(keys(%{$settings})); |
|
} |
|
$ordered{$num} = $item; |
|
} |
|
} |
|
} |
|
my $maxnum = scalar(keys(%ordered)); |
|
if (keys(%ordered)) { |
|
my @items = sort { $a <=> $b } keys(%ordered); |
|
for (my $i=0; $i<@items; $i++) { |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
my $item = $ordered{$items[$i]}; |
|
my ($name,$ipranges,%commblocks,%courses); |
|
if (ref($settings->{$item}) eq 'HASH') { |
|
$name = $settings->{$item}->{'name'}; |
|
$ipranges = $settings->{$item}->{'ip'}; |
|
if (ref($settings->{$item}->{'commblocks'}) eq 'HASH') { |
|
%commblocks = %{$settings->{$item}->{'commblocks'}}; |
|
} |
|
if (ref($settings->{$item}->{'courses'}) eq 'HASH') { |
|
%courses = %{$settings->{$item}->{'courses'}}; |
|
} |
|
} |
|
my $chgstr = ' onchange="javascript:reorderIPaccess(this.form,'."'ipaccess_pos_".$item."'".');"'; |
|
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
|
.'<select name="ipaccess_pos_'.$item.'"'.$chgstr.'>'; |
|
for (my $k=0; $k<=$maxnum; $k++) { |
|
my $vpos = $k+1; |
|
my $selstr; |
|
if ($k == $i) { |
|
$selstr = ' selected="selected" '; |
|
} |
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
|
} |
|
$datatable .= '</select>'.(' 'x2). |
|
'<label><input type="checkbox" name="ipaccess_del" value="'.$item.'" />'. |
|
&mt('Delete?').'</label></span></td>'. |
|
'<td colspan="2"><input type="hidden" name="ipaccess_id_'.$i.'" value="'.$item.'" />'. |
|
&ipaccess_options($i,$itemcount,$dom,$name,$ipranges,\%commblocks,\%courses). |
|
'</td></tr>'; |
|
$itemcount ++; |
|
} |
|
} |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
my $chgstr = ' onchange="javascript:reorderIPaccess(this.form,'."'ipaccess_pos_add'".');"'; |
|
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". |
|
'<input type="hidden" name="ipaccess_maxnum" value="'.$maxnum.'" />'."\n". |
|
'<select name="ipaccess_pos_add"'.$chgstr.'>'; |
|
for (my $k=0; $k<$maxnum+1; $k++) { |
|
my $vpos = $k+1; |
|
my $selstr; |
|
if ($k == $maxnum) { |
|
$selstr = ' selected="selected" '; |
|
} |
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
|
} |
|
$datatable .= '</select> '."\n". |
|
'<input type="checkbox" name="ipaccess_add" value="1" />'.&mt('Add').'</span></td>'."\n". |
|
'<td colspan="2">'. |
|
&ipaccess_options('add',$itemcount,$dom). |
|
'</td>'."\n". |
|
'</tr>'."\n"; |
|
$$rowtotal ++; |
|
return $datatable; |
|
} |
|
|
|
sub ipaccess_options { |
|
my ($num,$itemcount,$dom,$name,$ipranges,$blocksref,$coursesref) = @_; |
|
my (%currblocks,%currcourses,$output); |
|
if (ref($blocksref) eq 'HASH') { |
|
%currblocks = %{$blocksref}; |
|
} |
|
if (ref($coursesref) eq 'HASH') { |
|
%currcourses = %{$coursesref}; |
|
} |
|
$output = '<fieldset><legend>'.&mt('Location(s)').'</legend>'. |
|
'<span class="LC_nobreak">'.&mt('Name').': '. |
|
'<input type="text" name="ipaccess_name_'.$num.'" value="'.$name.'" />'. |
|
'</span></fieldset>'. |
|
'<fieldset><legend>'.&mt('IP Range(s)').'</legend>'. |
|
&mt('Format for each IP range').': '.&mt('A.B.C.D/N or A.B.C.D-E.F.G.H').'<br />'. |
|
&mt('Range(s) will be stored as IP netblock(s) in CIDR notation (comma separated)').'<br />'. |
|
'<textarea name="ipaccess_range_'.$num.'" rows="3" cols="80">'. |
|
$ipranges.'</textarea></fieldset>'. |
|
'<fieldset><legend>'.&mt('Functionality Blocked?').'</legend>'. |
|
&blocker_checkboxes($num,$blocksref).'</fieldset>'. |
|
'<fieldset><legend>'.&mt('Courses/Communities allowed').'</legend>'. |
|
'<table>'; |
|
foreach my $cid (sort(keys(%currcourses))) { |
|
my %courseinfo = &Apache::lonnet::coursedescription($cid,{'one_time' => 1}); |
|
$output .= '<tr><td><span class="LC_nobreak">'. |
|
'<label><input type="checkbox" name="ipaccess_course_delete_'.$num.'" value="'.$cid.'" />'. |
|
&mt('Delete?').' <span class="LC_cusr_emph">'.$courseinfo{'description'}.'</span></label></span>'. |
|
' <span class="LC_fontsize_medium">('.$cid.')</span></td></tr>'; |
|
} |
|
$output .= '<tr><td><span class="LC_nobreak">'.&mt('Add').': '. |
|
'<input type="text" name="ipaccess_cdesc_'.$num.'" value="" onfocus="this.blur();opencrsbrowser('."'display','ipaccess_cnum_$num','ipaccess_cdom_$num','ipaccess_cdesc_$num'".');" />'. |
|
&Apache::loncommon::selectcourse_link('display','ipaccess_cnum_'.$num,'ipaccess_cdom_'.$num,'ipaccess_cdesc_'.$num,$dom,undef,'Course/Community'). |
|
'<input type="hidden" name="ipaccess_cnum_'.$num.'" value="" />'. |
|
'<input type="hidden" name="ipaccess_cdom_'.$num.'" value="" />'. |
|
'</span></td></tr></table>'."\n". |
|
'</fieldset>'; |
|
return $output; |
|
} |
|
|
|
sub blocker_checkboxes { |
|
my ($num,$blocks) = @_; |
|
my ($typeorder,$types) = &commblocktype_text(); |
|
my $numinrow = 6; |
|
my $output = '<table>'; |
|
for (my $i=0; $i<@{$typeorder}; $i++) { |
|
my $block = $typeorder->[$i]; |
|
my $blockstatus; |
|
if (ref($blocks) eq 'HASH') { |
|
if ($blocks->{$block} eq 'on') { |
|
$blockstatus = 'checked="checked"'; |
|
} |
|
} |
|
my $rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$output .= '</tr>'; |
|
} |
|
$output .= '<tr>'; |
|
} |
|
if ($i == scalar(@{$typeorder})-1) { |
|
my $colsleft = $numinrow-$rem; |
|
if ($colsleft > 1) { |
|
$output .= '<td colspan="'.$colsleft.'">'; |
|
} else { |
|
$output .= '<td>'; |
|
} |
|
} else { |
|
$output .= '<td>'; |
|
} |
|
my $item = 'ipaccess_block_'.$num; |
|
if ($blockstatus) { |
|
$blockstatus = ' '.$blockstatus; |
|
} |
|
$output .= '<span class="LC_nobreak"><label>'."\n". |
|
'<input type="checkbox" name="'.$item.'"'. |
|
$blockstatus.' value="'.$block.'"'.' />'. |
|
$types->{$block}.'</label></span>'."\n". |
|
'<br /></td>'; |
|
} |
|
$output .= '</tr></table>'; |
|
return $output; |
|
} |
|
|
|
sub commblocktype_text { |
|
my %types = &Apache::lonlocal::texthash( |
|
'com' => 'Messaging', |
|
'chat' => 'Chat Room', |
|
'boards' => 'Discussion', |
|
'port' => 'Portfolio', |
|
'groups' => 'Groups', |
|
'blogs' => 'Blogs', |
|
'about' => 'User Information', |
|
'printout' => 'Printouts', |
|
'passwd' => 'Change Password', |
|
'grades' => 'Gradebook', |
|
'search' => 'Course search', |
|
'wishlist' => 'Stored links', |
|
'annotate' => 'Annotations', |
|
); |
|
my $typeorder = ['com','chat','boards','port','groups','blogs','about','wishlist','printout','grades','search','annotate','passwd']; |
|
return ($typeorder,\%types); |
|
} |
|
|
sub print_rolecolors { |
sub print_rolecolors { |
my ($phase,$role,$dom,$confname,$settings,$rowtotal) = @_; |
my ($phase,$role,$dom,$confname,$settings,$rowtotal) = @_; |
my %choices = &color_font_choices(); |
my %choices = &color_font_choices(); |
Line 1302 sub display_color_options {
|
Line 1837 sub display_color_options {
|
my $datatable = '<tr'.$css_class.'>'. |
my $datatable = '<tr'.$css_class.'>'. |
'<td>'.$choices->{'font'}.'</td>'; |
'<td>'.$choices->{'font'}.'</td>'; |
if (!$is_custom->{'font'}) { |
if (!$is_custom->{'font'}) { |
$datatable .= '<td>'.&mt('Default in use:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>'; |
$datatable .= '<td>'.&mt('Default in use:').' <span class="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>'; |
} else { |
} else { |
$datatable .= '<td> </td>'; |
$datatable .= '<td> </td>'; |
} |
} |
Line 1311 sub display_color_options {
|
Line 1846 sub display_color_options {
|
$datatable .= '<td><span class="LC_nobreak">'. |
$datatable .= '<td><span class="LC_nobreak">'. |
'<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'. |
'<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'. |
' value="'.$current_color.'" /> '. |
' value="'.$current_color.'" /> '. |
' </td></tr>'; |
' </span></td></tr>'; |
unless ($role eq 'login') { |
unless ($role eq 'login') { |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td>'.$choices->{'fontmenu'}.'</td>'; |
'<td>'.$choices->{'fontmenu'}.'</td>'; |
if (!$is_custom->{'fontmenu'}) { |
if (!$is_custom->{'fontmenu'}) { |
$datatable .= '<td>'.&mt('Default in use:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>'; |
$datatable .= '<td>'.&mt('Default in use:').' <span class="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>'; |
} else { |
} else { |
$datatable .= '<td> </td>'; |
$datatable .= '<td> </td>'; |
} |
} |
Line 1326 sub display_color_options {
|
Line 1861 sub display_color_options {
|
'<input class="colorchooser" type="text" size="10" name="' |
'<input class="colorchooser" type="text" size="10" name="' |
.$role.'_fontmenu"'. |
.$role.'_fontmenu"'. |
' value="'.$current_color.'" /> '. |
' value="'.$current_color.'" /> '. |
' </td></tr>'; |
' </span></td></tr>'; |
} |
} |
my $switchserver = &check_switchserver($dom,$confname); |
my $switchserver = &check_switchserver($dom,$confname); |
foreach my $img (@{$images}) { |
foreach my $img (@{$images}) { |
Line 1334 sub display_color_options {
|
Line 1869 sub display_color_options {
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td>'.$choices->{$img}; |
'<td>'.$choices->{$img}; |
my ($imgfile,$img_import,$login_hdr_pick,$logincolors); |
my ($imgfile,$img_import,$login_hdr_pick,$logincolors,$alttext); |
if ($role eq 'login') { |
if ($role eq 'login') { |
if ($img eq 'login') { |
if ($img eq 'login') { |
$login_hdr_pick = |
$login_hdr_pick = |
Line 1342 sub display_color_options {
|
Line 1877 sub display_color_options {
|
$logincolors = |
$logincolors = |
&login_text_colors($img,$role,$logintext,$phase,$choices, |
&login_text_colors($img,$role,$logintext,$phase,$choices, |
$designs,$defaults); |
$designs,$defaults); |
} elsif ($img ne 'domlogo') { |
} else { |
$datatable.= &logo_display_options($img,$defaults,$designs); |
if ($img ne 'domlogo') { |
|
$datatable.= &logo_display_options($img,$defaults,$designs); |
|
} |
|
if (ref($designs->{'alttext'}) eq 'HASH') { |
|
$alttext = $designs->{'alttext'}{$img}; |
|
} |
} |
} |
} |
} |
$datatable .= '</td>'; |
$datatable .= '</td>'; |
Line 1385 sub display_color_options {
|
Line 1925 sub display_color_options {
|
if ($fullwidth ne '' && $fullheight ne '') { |
if ($fullwidth ne '' && $fullheight ne '') { |
if ($fullwidth > $width && $fullheight > $height) { |
if ($fullwidth > $width && $fullheight > $height) { |
my $size = $width.'x'.$height; |
my $size = $width.'x'.$height; |
system("convert -sample $size $input $output"); |
my @args = ('convert','-sample',$size,$input,$output); |
|
system({$args[0]} @args); |
$showfile = "/$imgdir/tn-".$filename; |
$showfile = "/$imgdir/tn-".$filename; |
} |
} |
} |
} |
Line 1434 sub display_color_options {
|
Line 1975 sub display_color_options {
|
$datatable .=' <input type="file" name="'.$role.'_'.$img.'" />'; |
$datatable .=' <input type="file" name="'.$role.'_'.$img.'" />'; |
} |
} |
} |
} |
|
if (($role eq 'login') && ($img ne 'login')) { |
|
$datatable .= (' ' x2).' <span class="LC_nobreak"><label>'.$choices->{'alttext'}.':'. |
|
'<input type="text" name="'.$role.'_alt_'.$img.'" size="10" value="'.$alttext.'" />'. |
|
'</label></span>'; |
|
} |
$datatable .= '</td></tr>'; |
$datatable .= '</td></tr>'; |
} |
} |
$itemcount ++; |
$itemcount ++; |
Line 1443 sub display_color_options {
|
Line 1989 sub display_color_options {
|
my $bgs_def; |
my $bgs_def; |
foreach my $item (@{$bgs}) { |
foreach my $item (@{$bgs}) { |
if (!$is_custom->{$item}) { |
if (!$is_custom->{$item}) { |
$bgs_def .= '<td><span class="LC_nobreak">'.$choices->{$item}.'</span> <span id="css_default_'.$role.'_'.$item.'" style="background-color: '.$defaults->{'bgs'}{$item}.';"> </span><br />'.$defaults->{'bgs'}{$item}.'</td>'; |
$bgs_def .= '<td><span class="LC_nobreak">'.$choices->{$item}.'</span> <span class="css_default_'.$role.'_'.$item.'" style="background-color: '.$defaults->{'bgs'}{$item}.';"> </span><br />'.$defaults->{'bgs'}{$item}.'</td>'; |
} |
} |
} |
} |
if ($bgs_def) { |
if ($bgs_def) { |
Line 1471 sub display_color_options {
|
Line 2017 sub display_color_options {
|
my $links_def; |
my $links_def; |
foreach my $item (@{$links}) { |
foreach my $item (@{$links}) { |
if (!$is_custom->{$item}) { |
if (!$is_custom->{$item}) { |
$links_def .= '<td>'.$choices->{$item}.'<br /><span id="css_default_'.$role.'_'.$item.'" style="color: '.$defaults->{'links'}{$item}.';">'.$defaults->{'links'}{$item}.'</span></td>'; |
$links_def .= '<td>'.$choices->{$item}.'<br /><span class="css_default_'.$role.'_'.$item.'" style="color: '.$defaults->{'links'}{$item}.';">'.$defaults->{'links'}{$item}.'</span></td>'; |
} |
} |
} |
} |
if ($links_def) { |
if ($links_def) { |
Line 1557 sub image_changes {
|
Line 2103 sub image_changes {
|
my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_; |
my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_; |
my $output; |
my $output; |
if ($img eq 'login') { |
if ($img eq 'login') { |
# suppress image for Log-in header |
$output = '</td><td>'.$logincolors; # suppress image for Log-in header |
} elsif (!$is_custom) { |
} elsif (!$is_custom) { |
if ($img ne 'domlogo') { |
if ($img ne 'domlogo') { |
$output .= &mt('Default image:').'<br />'; |
$output = &mt('Default image:').'<br />'; |
} else { |
} else { |
$output .= &mt('Default in use:').'<br />'; |
$output = &mt('Default in use:').'<br />'; |
} |
} |
} |
} |
if ($img eq 'login') { # suppress image for Log-in header |
if ($img ne 'login') { |
$output .= '<td>'.$logincolors; |
|
} else { |
|
if ($img_import) { |
if ($img_import) { |
$output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />'; |
$output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />'; |
} |
} |
Line 2011 sub print_quotas {
|
Line 2555 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 2023 sub print_requestmail {
|
Line 2567 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 2043 sub print_requestmail {
|
Line 2599 sub print_requestmail {
|
$datatable .= &mt('There are no active Domain Coordinators'); |
$datatable .= &mt('There are no active Domain Coordinators'); |
} |
} |
$datatable .='</td></tr>'; |
$datatable .='</td></tr>'; |
$$rowtotal += $rows; |
|
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 2052 sub print_studentcode {
|
Line 2607 sub print_studentcode {
|
my $rownum = 0; |
my $rownum = 0; |
my ($output,%current); |
my ($output,%current); |
my @crstypes = ('official','unofficial','community','textbook'); |
my @crstypes = ('official','unofficial','community','textbook'); |
if (ref($settings->{'uniquecode'}) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
foreach my $type (@crstypes) { |
if (ref($settings->{'uniquecode'}) eq 'HASH') { |
$current{$type} = $settings->{'uniquecode'}{$type}; |
foreach my $type (@crstypes) { |
|
$current{$type} = $settings->{'uniquecode'}{$type}; |
|
} |
} |
} |
} |
} |
$output .= '<tr>'. |
$output .= '<tr>'. |
Line 2075 sub print_studentcode {
|
Line 2632 sub print_studentcode {
|
} |
} |
|
|
sub print_textbookcourses { |
sub print_textbookcourses { |
my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$type,$settings,$rowtotal) = @_; |
my $rownum = 0; |
my $rownum = 0; |
my $css_class; |
my $css_class; |
my $itemcount = 1; |
my $itemcount = 1; |
my $maxnum = 0; |
my $maxnum = 0; |
my $bookshash; |
my $bookshash; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
$bookshash = $settings->{'textbooks'}; |
$bookshash = $settings->{$type}; |
} |
} |
my %ordered; |
my %ordered; |
if (ref($bookshash) eq 'HASH') { |
if (ref($bookshash) eq 'HASH') { |
Line 2095 sub print_textbookcourses {
|
Line 2652 sub print_textbookcourses {
|
} |
} |
my $confname = $dom.'-domainconfig'; |
my $confname = $dom.'-domainconfig'; |
my $switchserver = &check_switchserver($dom,$confname); |
my $switchserver = &check_switchserver($dom,$confname); |
$maxnum = scalar(keys(%ordered)); |
my $maxnum = scalar(keys(%ordered)); |
my $datatable = &textbookcourses_javascript(\%ordered); |
my $datatable; |
if (keys(%ordered)) { |
if (keys(%ordered)) { |
my @items = sort { $a <=> $b } keys(%ordered); |
my @items = sort { $a <=> $b } keys(%ordered); |
for (my $i=0; $i<@items; $i++) { |
for (my $i=0; $i<@items; $i++) { |
Line 2104 sub print_textbookcourses {
|
Line 2661 sub print_textbookcourses {
|
my $key = $ordered{$items[$i]}; |
my $key = $ordered{$items[$i]}; |
my %coursehash=&Apache::lonnet::coursedescription($key); |
my %coursehash=&Apache::lonnet::coursedescription($key); |
my $coursetitle = $coursehash{'description'}; |
my $coursetitle = $coursehash{'description'}; |
my ($subject,$title,$author,$image,$imgsrc,$cdom,$cnum); |
my ($subject,$title,$author,$publisher,$image,$imgsrc,$cdom,$cnum); |
if (ref($bookshash->{$key}) eq 'HASH') { |
if (ref($bookshash->{$key}) eq 'HASH') { |
$subject = $bookshash->{$key}->{'subject'}; |
$subject = $bookshash->{$key}->{'subject'}; |
$title = $bookshash->{$key}->{'title'}; |
$title = $bookshash->{$key}->{'title'}; |
$author = $bookshash->{$key}->{'author'}; |
if ($type eq 'textbooks') { |
$image = $bookshash->{$key}->{'image'}; |
$publisher = $bookshash->{$key}->{'publisher'}; |
if ($image ne '') { |
$author = $bookshash->{$key}->{'author'}; |
my ($path,$imagefile) = ($image =~ m{^(.+)/([^/]+)$}); |
$image = $bookshash->{$key}->{'image'}; |
my $imagethumb = "$path/tn-".$imagefile; |
if ($image ne '') { |
$imgsrc = '<img src="'.$imagethumb.'" alt="'.&mt('Textbook image').'" />'; |
my ($path,$imagefile) = ($image =~ m{^(.+)/([^/]+)$}); |
|
my $imagethumb = "$path/tn-".$imagefile; |
|
$imgsrc = '<img src="'.$imagethumb.'" alt="'.&mt('Textbook image').'" />'; |
|
} |
} |
} |
} |
} |
my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$key'".');"'; |
my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$type".'_'."$key','$type'".');"'; |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
.'<select name="'.$key.'"'.$chgstr.'>'; |
.'<select name="'.$type.'_'.$key.'"'.$chgstr.'>'; |
for (my $k=0; $k<=$maxnum; $k++) { |
for (my $k=0; $k<=$maxnum; $k++) { |
my $vpos = $k+1; |
my $vpos = $k+1; |
my $selstr; |
my $selstr; |
Line 2128 sub print_textbookcourses {
|
Line 2688 sub print_textbookcourses {
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
} |
} |
$datatable .= '</select>'.(' 'x2). |
$datatable .= '</select>'.(' 'x2). |
'<label><input type="checkbox" name="book_del" value="'.$key.'" />'. |
'<label><input type="checkbox" name="'.$type.'_del" value="'.$key.'" />'. |
&mt('Delete?').'</label></span></td>'. |
&mt('Delete?').'</label></span></td>'. |
'<td colspan="2">'. |
'<td colspan="2">'. |
'<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="book_subject_'.$i.'" value="'.$subject.'" /></span> '. |
'<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_subject_'.$i.'" value="'.$subject.'" /></span> '. |
(' 'x2). |
|
'<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="book_title_'.$i.'" value="'.$title.'" /></span> '. |
|
(' 'x2). |
|
'<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="book_author_'.$i.'" value="'.$author.'" /></span> '. |
|
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.&mt('Thumbnail:'); |
'<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="'.$type.'_title_'.$i.'" value="'.$title.'" /></span> '; |
if ($image) { |
if ($type eq 'textbooks') { |
$datatable .= '<span class="LC_nobreak">'. |
$datatable .= (' 'x2). |
$imgsrc. |
'<span class="LC_nobreak">'.&mt('Publisher:').'<input type="text" size="10" name="'.$type.'_publisher_'.$i.'" value="'.$publisher.'" /></span> '. |
'<label><input type="checkbox" name="book_image_del"'. |
(' 'x2). |
' value="'.$key.'" />'.&mt('Delete?').'</label></span> '. |
'<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="'.$type.'_author_'.$i.'" value="'.$author.'" /></span> '. |
'<span class="LC_nobreak"> '.&mt('Replace:').' '; |
(' 'x2). |
} |
'<span class="LC_nobreak">'.&mt('Thumbnail:'); |
if ($switchserver) { |
if ($image) { |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
$datatable .= $imgsrc. |
} else { |
'<label><input type="checkbox" name="'.$type.'_image_del"'. |
$datatable .= '<input type="file" name="book_image_'.$i.'" value="" />'; |
' value="'.$key.'" />'.&mt('Delete?').'</label></span> '. |
|
'<span class="LC_nobreak"> '.&mt('Replace:').' '; |
|
} |
|
if ($switchserver) { |
|
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
|
} else { |
|
$datatable .= '<input type="file" name="'.$type.'_image_'.$i.'" value="" />'; |
|
} |
} |
} |
$datatable .= '<input type="hidden" name="book_id_'.$i.'" value="'.$key.'" /></span> '. |
$datatable .= '<input type="hidden" name="'.$type.'_id_'.$i.'" value="'.$type.'_'.$key.'" /></span> '. |
'<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. |
'<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. |
$coursetitle.'</span></td></tr>'."\n"; |
$coursetitle.'</span></td></tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
} |
} |
} |
} |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'addbook_pos'".');"'; |
my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$type"."_addbook_pos','$type'".');"'; |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". |
'<input type="hidden" name="book_maxnum" value="'.$maxnum.'" />'."\n". |
'<input type="hidden" name="'.$type.'_maxnum" value="'.$maxnum.'" />'."\n". |
'<select name="addbook_pos"'.$chgstr.'>'; |
'<select name="'.$type.'_addbook_pos"'.$chgstr.'>'; |
for (my $k=0; $k<$maxnum+1; $k++) { |
for (my $k=0; $k<$maxnum+1; $k++) { |
my $vpos = $k+1; |
my $vpos = $k+1; |
my $selstr; |
my $selstr; |
Line 2170 sub print_textbookcourses {
|
Line 2733 sub print_textbookcourses {
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
} |
} |
$datatable .= '</select> '."\n". |
$datatable .= '</select> '."\n". |
'<input type="checkbox" name="addbook" value="1" />'.&mt('Add').'</td>'."\n". |
'<input type="checkbox" name="'.$type.'_addbook" value="1" />'.&mt('Add').'</span></td>'."\n". |
'<td colspan="2">'. |
'<td colspan="2">'. |
'<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="addbook_subject" value="" /></span> '."\n". |
'<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_addbook_subject" value="" /></span> '."\n". |
(' 'x2). |
|
'<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="addbook_title" value="" /></span> '."\n". |
|
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="addbook_author" value="" /></span> '."\n". |
'<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="'.$type.'_addbook_title" value="" /></span> '."\n". |
(' 'x2). |
(' 'x2); |
'<span class="LC_nobreak">'.&mt('Image:').' '; |
if ($type eq 'textbooks') { |
if ($switchserver) { |
$datatable .= '<span class="LC_nobreak">'.&mt('Publisher:').'<input type="text" size="10" name="'.$type.'_addbook_publisher" value="" /></span> '."\n". |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
(' 'x2). |
} else { |
'<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="'.$type.'_addbook_author" value="" /></span> '."\n". |
$datatable .= '<input type="file" name="addbook_image" value="" />'; |
(' 'x2). |
} |
'<span class="LC_nobreak">'.&mt('Image:').' '; |
$datatable .= '</span>'."\n". |
if ($switchserver) { |
'<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
&Apache::loncommon::select_dom_form($env{'request.role.domain'},'addbook_cdom'). |
} else { |
'<input type="text" size="25" name="addbook_cnum" value="" />'. |
$datatable .= '<input type="file" name="'.$type.'_addbook_image" value="" />'; |
|
} |
|
$datatable .= '</span>'."\n"; |
|
} |
|
$datatable .= '<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. |
|
&Apache::loncommon::select_dom_form($env{'request.role.domain'},$type.'_addbook_cdom'). |
|
'<input type="text" size="25" name="'.$type.'_addbook_cnum" value="" />'. |
&Apache::loncommon::selectcourse_link |
&Apache::loncommon::selectcourse_link |
('display','addbook_cnum','addbook_cdom',undef,undef,undef,'Course'); |
('display',$type.'_addbook_cnum',$type.'_addbook_cdom',undef,undef,undef,'Course'). |
'</span></td>'."\n". |
'</span></td>'."\n". |
'</tr>'."\n"; |
'</tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
Line 2197 sub print_textbookcourses {
|
Line 2764 sub print_textbookcourses {
|
} |
} |
|
|
sub textbookcourses_javascript { |
sub textbookcourses_javascript { |
my ($textbooks) = @_; |
my ($settings) = @_; |
return unless(ref($textbooks) eq 'HASH'); |
return unless(ref($settings) eq 'HASH'); |
my $num = scalar(keys(%{$textbooks})); |
my (%ordered,%total,%jstext); |
my @jsarray; |
foreach my $type ('textbooks','templates') { |
foreach my $item (sort {$a <=> $b } (keys(%{$textbooks}))) { |
$total{$type} = 0; |
push(@jsarray,$textbooks->{$item}); |
if (ref($settings->{$type}) eq 'HASH') { |
|
foreach my $item (keys(%{$settings->{$type}})) { |
|
if (ref($settings->{$type}->{$item}) eq 'HASH') { |
|
my $num = $settings->{$type}->{$item}{'order'}; |
|
$ordered{$type}{$num} = $item; |
|
} |
|
} |
|
$total{$type} = scalar(keys(%{$settings->{$type}})); |
|
} |
|
my @jsarray = (); |
|
foreach my $item (sort {$a <=> $b } (keys(%{$ordered{$type}}))) { |
|
push(@jsarray,$ordered{$type}{$item}); |
|
} |
|
$jstext{$type} = ' var '.$type.' = Array('."'".join("','",@jsarray)."'".');'."\n"; |
} |
} |
my $jstext = ' var textbooks = Array('."'".join("','",@jsarray)."'".');'."\n"; |
|
return <<"ENDSCRIPT"; |
return <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
function reorderBooks(form,item) { |
function reorderBooks(form,item,caller) { |
var changedVal; |
var changedVal; |
$jstext |
$jstext{'textbooks'}; |
var newpos = 'addbook_pos'; |
$jstext{'templates'}; |
|
var newpos; |
|
var maxh; |
|
if (caller == 'textbooks') { |
|
newpos = 'textbooks_addbook_pos'; |
|
maxh = 1 + $total{'textbooks'}; |
|
} else { |
|
newpos = 'templates_addbook_pos'; |
|
maxh = 1 + $total{'templates'}; |
|
} |
var current = new Array; |
var current = new Array; |
var maxh = 1 + $num; |
|
var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value; |
var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value; |
if (item == newpos) { |
if (item == newpos) { |
changedVal = newitemVal; |
changedVal = newitemVal; |
Line 2221 $jstext
|
Line 2808 $jstext
|
changedVal = form.elements[item].options[form.elements[item].selectedIndex].value; |
changedVal = form.elements[item].options[form.elements[item].selectedIndex].value; |
current[newitemVal] = newpos; |
current[newitemVal] = newpos; |
} |
} |
for (var i=0; i<textbooks.length; i++) { |
if (caller == 'textbooks') { |
var elementName = textbooks[i]; |
for (var i=0; i<textbooks.length; i++) { |
|
var elementName = 'textbooks_'+textbooks[i]; |
|
if (elementName != item) { |
|
if (form.elements[elementName]) { |
|
var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; |
|
current[currVal] = elementName; |
|
} |
|
} |
|
} |
|
} |
|
if (caller == 'templates') { |
|
for (var i=0; i<templates.length; i++) { |
|
var elementName = 'templates_'+templates[i]; |
|
if (elementName != item) { |
|
if (form.elements[elementName]) { |
|
var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; |
|
current[currVal] = elementName; |
|
} |
|
} |
|
} |
|
} |
|
var oldVal; |
|
for (var j=0; j<maxh; j++) { |
|
if (current[j] == undefined) { |
|
oldVal = j; |
|
} |
|
} |
|
if (oldVal < changedVal) { |
|
for (var k=oldVal+1; k<=changedVal ; k++) { |
|
var elementName = current[k]; |
|
form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex - 1; |
|
} |
|
} else { |
|
for (var k=changedVal; k<oldVal; k++) { |
|
var elementName = current[k]; |
|
form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1; |
|
} |
|
} |
|
return; |
|
} |
|
|
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
|
sub wafproxy_javascript { |
|
my ($dom) = @_; |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
function updateWAF() { |
|
if (document.getElementById('wafproxy_remoteip')) { |
|
var wafremote = 0; |
|
if (document.display.wafproxy_remoteip.options[document.display.wafproxy_remoteip.selectedIndex].value == 'h') { |
|
wafremote = 1; |
|
} |
|
var fields = new Array('header','trust'); |
|
for (var i=0; i<fields.length; i++) { |
|
if (document.getElementById('wafproxy_'+fields[i])) { |
|
if (wafremote == 1) { |
|
document.getElementById('wafproxy_'+fields[i]).style.display = 'table-row'; |
|
} |
|
else { |
|
document.getElementById('wafproxy_'+fields[i]).style.display = 'none'; |
|
} |
|
} |
|
} |
|
if (document.getElementById('wafproxyranges_$dom')) { |
|
if (wafremote == 1) { |
|
document.getElementById('wafproxyranges_$dom').style.display = 'inline-block'; |
|
} else { |
|
for (var i=0; i<document.display.wafproxy_vpnaccess.length; i++) { |
|
if (document.display.wafproxy_vpnaccess[i].checked) { |
|
if (document.display.wafproxy_vpnaccess[i].value == 0) { |
|
document.getElementById('wafproxyranges_$dom').style.display = 'none'; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function checkWAF() { |
|
if (document.getElementById('wafproxy_remoteip')) { |
|
var wafvpn = 0; |
|
for (var i=0; i<document.display.wafproxy_vpnaccess.length; i++) { |
|
if (document.display.wafproxy_vpnaccess[i].checked) { |
|
if (document.display.wafproxy_vpnaccess[i].value == 1) { |
|
wafvpn = 1; |
|
} |
|
break; |
|
} |
|
} |
|
var vpn = new Array('vpnint','vpnext'); |
|
for (var i=0; i<vpn.length; i++) { |
|
if (document.getElementById('wafproxy_show_'+vpn[i])) { |
|
if (wafvpn == 1) { |
|
document.getElementById('wafproxy_show_'+vpn[i]).style.display = 'table-row'; |
|
} |
|
else { |
|
document.getElementById('wafproxy_show_'+vpn[i]).style.display = 'none'; |
|
} |
|
} |
|
} |
|
if (document.getElementById('wafproxyranges_$dom')) { |
|
if (wafvpn == 1) { |
|
document.getElementById('wafproxyranges_$dom').style.display = 'inline-block'; |
|
} |
|
else if (document.display.wafproxy_remoteip.options[document.display.wafproxy_remoteip.selectedIndex].value != 'h') { |
|
document.getElementById('wafproxyranges_$dom').style.display = 'none'; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function toggleWAF() { |
|
if (document.getElementById('wafproxy_table')) { |
|
var wafproxy = 0; |
|
for (var i=0; i<document.display.wafproxy_${dom}.length; i++) { |
|
if (document.display.wafproxy_${dom}[i].checked) { |
|
if (document.display.wafproxy_${dom}[i].value == 1) { |
|
wafproxy = 1; |
|
break; |
|
} |
|
} |
|
} |
|
if (wafproxy == 1) { |
|
document.getElementById('wafproxy_table').style.display='inline'; |
|
} |
|
else { |
|
document.getElementById('wafproxy_table').style.display='none'; |
|
} |
|
if (document.getElementById('wafproxyrow_${dom}')) { |
|
if (wafproxy == 1) { |
|
document.getElementById('wafproxyrow_${dom}').style.display = 'table-row'; |
|
} |
|
else { |
|
document.getElementById('wafproxyrow_${dom}').style.display = 'none'; |
|
} |
|
} |
|
if (document.getElementById('nowafproxyrow_$dom')) { |
|
if (wafproxy == 1) { |
|
document.getElementById('nowafproxyrow_${dom}').style.display = 'none'; |
|
} |
|
else { |
|
document.getElementById('nowafproxyrow_${dom}').style.display = 'table-row'; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
|
sub autoupdate_javascript { |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
function toggleLastActiveDays(form) { |
|
var radioname = 'lastactive'; |
|
var divid = 'lastactive_div'; |
|
var num = form.elements[radioname].length; |
|
if (num) { |
|
var setvis = ''; |
|
for (var i=0; i<num; i++) { |
|
if (form.elements[radioname][i].checked) { |
|
if (form.elements[radioname][i].value == '1') { |
|
if (document.getElementById(divid)) { |
|
document.getElementById(divid).style.display = 'inline-block'; |
|
} |
|
setvis = 1; |
|
} |
|
break; |
|
} |
|
} |
|
if (!setvis) { |
|
if (document.getElementById(divid)) { |
|
document.getElementById(divid).style.display = 'none'; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
|
sub autoenroll_javascript { |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
function toggleFailsafe(form) { |
|
var radioname = 'autoenroll_failsafe'; |
|
var divid = 'autoenroll_failsafe_div'; |
|
var num = form.elements[radioname].length; |
|
if (num) { |
|
var setvis = ''; |
|
for (var i=0; i<num; i++) { |
|
if (form.elements[radioname][i].checked) { |
|
if ((form.elements[radioname][i].value == 'zero') || (form.elements[radioname][i].value == 'any')) { |
|
if (document.getElementById(divid)) { |
|
document.getElementById(divid).style.display = 'inline-block'; |
|
} |
|
setvis = 1; |
|
} |
|
break; |
|
} |
|
} |
|
if (!setvis) { |
|
if (document.getElementById(divid)) { |
|
document.getElementById(divid).style.display = 'none'; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
|
sub saml_javascript { |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
function toggleSamlOptions(form,hostid) { |
|
var radioname = 'saml_'+hostid; |
|
var tablecellon = 'samloptionson_'+hostid; |
|
var tablecelloff = 'samloptionsoff_'+hostid; |
|
var num = form.elements[radioname].length; |
|
if (num) { |
|
var setvis = ''; |
|
for (var i=0; i<num; i++) { |
|
if (form.elements[radioname][i].checked) { |
|
if (form.elements[radioname][i].value == '1') { |
|
if (document.getElementById(tablecellon)) { |
|
document.getElementById(tablecellon).style.display=''; |
|
} |
|
if (document.getElementById(tablecelloff)) { |
|
document.getElementById(tablecelloff).style.display='none'; |
|
} |
|
setvis = 1; |
|
} |
|
break; |
|
} |
|
} |
|
if (!setvis) { |
|
if (document.getElementById(tablecellon)) { |
|
document.getElementById(tablecellon).style.display='none'; |
|
} |
|
if (document.getElementById(tablecelloff)) { |
|
document.getElementById(tablecelloff).style.display=''; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
|
sub ipaccess_javascript { |
|
my ($settings) = @_; |
|
my (%ordered,$total,%jstext); |
|
$total = 0; |
|
if (ref($settings) eq 'HASH') { |
|
foreach my $item (keys(%{$settings})) { |
|
if (ref($settings->{$item}) eq 'HASH') { |
|
my $num = $settings->{$item}{'order'}; |
|
$ordered{$num} = $item; |
|
} |
|
} |
|
$total = scalar(keys(%{$settings})); |
|
} |
|
my @jsarray = (); |
|
foreach my $item (sort {$a <=> $b } (keys(%ordered))) { |
|
push(@jsarray,$ordered{$item}); |
|
} |
|
my $jstext = ' var ipaccess = Array('."'".join("','",@jsarray)."'".');'."\n"; |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
function reorderIPaccess(form,item) { |
|
var changedVal; |
|
$jstext |
|
var newpos = 'ipaccess_pos_add'; |
|
var maxh = 1 + $total; |
|
var current = new Array; |
|
var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value; |
|
if (item == newpos) { |
|
changedVal = newitemVal; |
|
} else { |
|
changedVal = form.elements[item].options[form.elements[item].selectedIndex].value; |
|
current[newitemVal] = newpos; |
|
} |
|
for (var i=0; i<ipaccess.length; i++) { |
|
var elementName = 'ipaccess_pos_'+ipaccess[i]; |
if (elementName != item) { |
if (elementName != item) { |
if (form.elements[elementName]) { |
if (form.elements[elementName]) { |
var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; |
var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; |
Line 2249 $jstext
|
Line 3145 $jstext
|
} |
} |
return; |
return; |
} |
} |
|
|
// ]]> |
// ]]> |
</script> |
</script> |
|
|
Line 2259 ENDSCRIPT
|
Line 3154 ENDSCRIPT
|
sub print_autoenroll { |
sub print_autoenroll { |
my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$settings,$rowtotal) = @_; |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my ($defdom,$runon,$runoff,$coownerson,$coownersoff); |
my ($defdom,$runon,$runoff,$coownerson,$coownersoff, |
|
$failsafe,$autofailsafe,$failsafesty,%failsafechecked); |
|
$failsafesty = 'none'; |
|
%failsafechecked = ( |
|
off => ' checked="checked"', |
|
); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (exists($settings->{'run'})) { |
if (exists($settings->{'run'})) { |
if ($settings->{'run'} eq '0') { |
if ($settings->{'run'} eq '0') { |
Line 2293 sub print_autoenroll {
|
Line 3193 sub print_autoenroll {
|
if (exists($settings->{'sender_domain'})) { |
if (exists($settings->{'sender_domain'})) { |
$defdom = $settings->{'sender_domain'}; |
$defdom = $settings->{'sender_domain'}; |
} |
} |
|
if (exists($settings->{'failsafe'})) { |
|
$failsafe = $settings->{'failsafe'}; |
|
if ($failsafe eq 'zero') { |
|
$failsafechecked{'zero'} = ' checked="checked"'; |
|
$failsafechecked{'off'} = ''; |
|
$failsafesty = 'inline-block'; |
|
} elsif ($failsafe eq 'any') { |
|
$failsafechecked{'any'} = ' checked="checked"'; |
|
$failsafechecked{'off'} = ''; |
|
} |
|
$autofailsafe = $settings->{'autofailsafe'}; |
|
} elsif (exists($settings->{'autofailsafe'})) { |
|
$autofailsafe = $settings->{'autofailsafe'}; |
|
if ($autofailsafe ne '') { |
|
$failsafechecked{'zero'} = ' checked="checked"'; |
|
$failsafe = 'zero'; |
|
$failsafechecked{'off'} = ''; |
|
} |
|
} |
} else { |
} else { |
if ($autorun) { |
if ($autorun) { |
$runon = ' checked="checked" '; |
$runon = ' checked="checked" '; |
Line 2328 sub print_autoenroll {
|
Line 3247 sub print_autoenroll {
|
$coownerson.' value="1" />'.&mt('Yes').'</label> '. |
$coownerson.' value="1" />'.&mt('Yes').'</label> '. |
'<label><input type="radio" name="autoassign_coowners"'. |
'<label><input type="radio" name="autoassign_coowners"'. |
$coownersoff.' value="0" />'.&mt('No').'</label></span></td>'. |
$coownersoff.' value="0" />'.&mt('No').'</label></span></td>'. |
'</tr>'; |
'</tr><tr>'. |
$$rowtotal += 3; |
'<td>'.&mt('Failsafe for no drops when institutional data missing').'</td>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<span class="LC_nobreak"><label><input type="radio" name="autoenroll_failsafe" value="off" onclick="toggleFailsafe(this.form)"'.$failsafechecked{'off'}.' />'.&mt('Not in use').'</label></span> '. |
|
'<span class="LC_nobreak"><label><input type="radio" name="autoenroll_failsafe" value="zero" onclick="toggleFailsafe(this.form)"'.$failsafechecked{'zero'}.' />'.&mt('Retrieved section enrollment is zero').'</label></span><br />'. |
|
'<span class="LC_nobreak"><label><input type="radio" name="autoenroll_failsafe" value="any" onclick="toggleFailsafe(this.form)"'.$failsafechecked{'any'}.' />'.&mt('Retrieved section enrollment is zero or greater').'</label></span>'. |
|
'<div class="LC_floatleft" style="display:'.$failsafesty.';" id="autoenroll_failsafe_div">'. |
|
'<span class="LC_nobreak">'. |
|
&mt('Threshold for number of students in section to drop: [_1]', |
|
'<input type="text" name="autoenroll_autofailsafe" value="'.$autofailsafe.'" size="4" />'). |
|
'</span></div></td></tr>'; |
|
$$rowtotal += 4; |
return $datatable; |
return $datatable; |
} |
} |
|
|
sub print_autoupdate { |
sub print_autoupdate { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my $datatable; |
my ($enable,$datatable); |
if ($position eq 'top') { |
if ($position eq 'top') { |
|
my %choices = &Apache::lonlocal::texthash ( |
|
run => 'Auto-update active?', |
|
classlists => 'Update information in classlists?', |
|
unexpired => 'Skip updates for users without active or future roles?', |
|
lastactive => 'Skip updates for inactive users?', |
|
); |
|
my $itemcount = 0; |
my $updateon = ' '; |
my $updateon = ' '; |
my $updateoff = ' checked="checked" '; |
my $updateoff = ' checked="checked" '; |
my $classlistson = ' '; |
|
my $classlistsoff = ' checked="checked" '; |
|
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ($settings->{'run'} eq '1') { |
if ($settings->{'run'} eq '1') { |
$updateon = $updateoff; |
$updateon = $updateoff; |
$updateoff = ' '; |
$updateoff = ' '; |
} |
} |
if ($settings->{'classlists'} eq '1') { |
|
$classlistson = $classlistsoff; |
|
$classlistsoff = ' '; |
|
} |
|
} |
} |
my %title = ( |
$enable = '<tr class="LC_odd_row">'. |
run => 'Auto-update active?', |
'<td>'.&mt($choices{'run'}).'</td>'. |
classlists => 'Update information in classlists?', |
'<td class="LC_left_item"><span class="LC_nobreak"><label>'. |
); |
|
$datatable = '<tr class="LC_odd_row">'. |
|
'<td>'.&mt($title{'run'}).'</td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="autoupdate_run"'. |
'<input type="radio" name="autoupdate_run"'. |
$updateon.' value="1" />'.&mt('Yes').'</label> '. |
$updateoff.'value="0" />'.&mt('No').'</label> '. |
'<label><input type="radio" name="autoupdate_run"'. |
'<label><input type="radio" name="autoupdate_run"'. |
$updateoff.'value="0" />'.&mt('No').'</label></span></td>'. |
$updateon.'value="1" />'.&mt('Yes').'</label></span></td>'. |
'</tr><tr>'. |
|
'<td>'.&mt($title{'classlists'}).'</td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="classlists"'. |
|
$classlistson.' value="1" />'.&mt('Yes').'</label> '. |
|
'<label><input type="radio" name="classlists"'. |
|
$classlistsoff.'value="0" />'.&mt('No').'</label></span></td>'. |
|
'</tr>'; |
'</tr>'; |
$$rowtotal += 2; |
my @toggles = ('classlists','unexpired'); |
|
my %defaultchecked = ('classlists' => 'off', |
|
'unexpired' => 'off' |
|
); |
|
$$rowtotal ++; |
|
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
|
\%choices,$itemcount,'','','left','no'); |
|
$datatable = $enable.$datatable; |
|
$$rowtotal += $itemcount; |
|
my $lastactiveon = ' '; |
|
my $lastactiveoff = ' checked="checked" '; |
|
my $lastactivestyle = 'none'; |
|
my $lastactivedays; |
|
my $onclick = ' onclick="javascript:toggleLastActiveDays(this.form);"'; |
|
if (ref($settings) eq 'HASH') { |
|
if ($settings->{'lastactive'} =~ /^\d+$/) { |
|
$lastactiveon = $lastactiveoff; |
|
$lastactiveoff = ' '; |
|
$lastactivestyle = 'inline-block'; |
|
$lastactivedays = $settings->{'lastactive'}; |
|
} |
|
} |
|
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td>'.$choices{'lastactive'}.'</td>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="lastactive"'. |
|
$lastactiveoff.'value="0"'.$onclick.' />'.&mt('No').'</label>'. |
|
' <label>'. |
|
'<input type="radio" name="lastactive"'. |
|
$lastactiveon.' value="1"'.$onclick.' />'.&mt('Yes').'</label>'. |
|
'<div id="lastactive_div" style="display:'.$lastactivestyle.';">'. |
|
': '.&mt('inactive = no activity in last [_1] days', |
|
'<input type="text" size="5" name="lastactivedays" value="'. |
|
$lastactivedays.'" />'). |
|
'</span></td>'. |
|
'</tr>'; |
|
$$rowtotal ++; |
} elsif ($position eq 'middle') { |
} elsif ($position eq 'middle') { |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my $numinrow = 3; |
my $numinrow = 3; |
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 2444 sub print_autocreate {
|
Line 3400 sub print_autocreate {
|
$createoff{'req'}.' value="0" />'.&mt('No').'</label></span>'; |
$createoff{'req'}.' value="0" />'.&mt('No').'</label></span>'; |
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
'autocreate_xmldc',%currhash); |
'autocreate_xmldc',%currhash); |
|
$datatable .= '</td></tr><tr class="LC_odd_row"><td>'; |
if ($numdc > 1) { |
if ($numdc > 1) { |
$datatable .= '</td></tr><tr class="LC_odd_row"><td>'. |
$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)'). |
&mt('Course creation processed as: (choose Dom. Coord.)'). |
'</td><td class="LC_left_item">'; |
'</td><td class="LC_left_item">'.$dctable.'</td></tr>'; |
|
} else { |
} else { |
$datatable .= $dctable.'</td></tr>'; |
$datatable .= &mt('Course creation processed as:'). |
|
'</td><td class="LC_right_item">'; |
} |
} |
|
$datatable .= $dctable.'</td></tr>'; |
$$rowtotal += $rows; |
$$rowtotal += $rows; |
return $datatable; |
return $datatable; |
} |
} |
|
|
sub print_directorysrch { |
sub print_directorysrch { |
my ($dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my $srchon = ' '; |
my $datatable; |
my $srchoff = ' checked="checked" '; |
if ($position eq 'top') { |
my ($exacton,$containson,$beginson); |
my $instsrchon = ' '; |
my $localon = ' '; |
my $instsrchoff = ' checked="checked" '; |
my $localoff = ' checked="checked" '; |
my ($exacton,$containson,$beginson); |
if (ref($settings) eq 'HASH') { |
my $instlocalon = ' '; |
if ($settings->{'available'} eq '1') { |
my $instlocaloff = ' checked="checked" '; |
$srchon = $srchoff; |
if (ref($settings) eq 'HASH') { |
$srchoff = ' '; |
if ($settings->{'available'} eq '1') { |
} |
$instsrchon = $instsrchoff; |
if ($settings->{'localonly'} eq '1') { |
$instsrchoff = ' '; |
$localon = $localoff; |
} |
$localoff = ' '; |
if ($settings->{'localonly'} eq '1') { |
} |
$instlocalon = $instlocaloff; |
if (ref($settings->{'searchtypes'}) eq 'ARRAY') { |
$instlocaloff = ' '; |
foreach my $type (@{$settings->{'searchtypes'}}) { |
} |
if ($type eq 'exact') { |
if (ref($settings->{'searchtypes'}) eq 'ARRAY') { |
|
foreach my $type (@{$settings->{'searchtypes'}}) { |
|
if ($type eq 'exact') { |
|
$exacton = ' checked="checked" '; |
|
} elsif ($type eq 'contains') { |
|
$containson = ' checked="checked" '; |
|
} elsif ($type eq 'begins') { |
|
$beginson = ' checked="checked" '; |
|
} |
|
} |
|
} else { |
|
if ($settings->{'searchtypes'} eq 'exact') { |
|
$exacton = ' checked="checked" '; |
|
} elsif ($settings->{'searchtypes'} eq 'contains') { |
|
$containson = ' checked="checked" '; |
|
} elsif ($settings->{'searchtypes'} eq 'specify') { |
$exacton = ' checked="checked" '; |
$exacton = ' checked="checked" '; |
} elsif ($type eq 'contains') { |
|
$containson = ' checked="checked" '; |
$containson = ' checked="checked" '; |
} elsif ($type eq 'begins') { |
|
$beginson = ' checked="checked" '; |
|
} |
} |
} |
} |
} else { |
|
if ($settings->{'searchtypes'} eq 'exact') { |
|
$exacton = ' checked="checked" '; |
|
} elsif ($settings->{'searchtypes'} eq 'contains') { |
|
$containson = ' checked="checked" '; |
|
} elsif ($settings->{'searchtypes'} eq 'specify') { |
|
$exacton = ' checked="checked" '; |
|
$containson = ' checked="checked" '; |
|
} |
|
} |
} |
} |
my ($searchtitles,$titleorder) = &sorted_searchtitles(); |
my ($searchtitles,$titleorder) = &sorted_searchtitles(); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
|
|
my $numinrow = 4; |
my $numinrow = 4; |
my $cansrchrow = 0; |
my $cansrchrow = 0; |
my $datatable='<tr class="LC_odd_row">'. |
$datatable='<tr class="LC_odd_row">'. |
'<td colspan="2"><span class ="LC_nobreak">'.&mt('Directory search available?').'</span></td>'. |
'<td colspan="2"><span class ="LC_nobreak">'.&mt('Institutional directory search available?').'</span></td>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<input type="radio" name="dirsrch_available"'. |
'<input type="radio" name="dirsrch_available"'. |
$srchon.' value="1" />'.&mt('Yes').'</label> '. |
$instsrchon.' value="1" />'.&mt('Yes').'</label> '. |
'<label><input type="radio" name="dirsrch_available"'. |
'<label><input type="radio" name="dirsrch_available"'. |
$srchoff.' value="0" />'.&mt('No').'</label></span></td>'. |
$instsrchoff.' value="0" />'.&mt('No').'</label></span></td>'. |
'</tr><tr>'. |
'</tr><tr>'. |
'<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search?').'</span></td>'. |
'<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search institution?').'</span></td>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<input type="radio" name="dirsrch_localonly"'. |
'<input type="radio" name="dirsrch_instlocalonly"'. |
$localoff.' value="0" />'.&mt('Yes').'</label> '. |
$instlocaloff.' value="0" />'.&mt('Yes').'</label> '. |
'<label><input type="radio" name="dirsrch_localonly"'. |
'<label><input type="radio" name="dirsrch_instlocalonly"'. |
$localon.' value="1" />'.&mt('No').'</label></span></td>'. |
$instlocalon.' value="1" />'.&mt('No').'</label></span></td>'. |
'</tr>'; |
'</tr>'; |
$$rowtotal += 2; |
$$rowtotal += 2; |
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', |
$cansrchrow = 1; |
$rowtotal); |
|
$cansrchrow = 1; |
|
} |
} |
} |
} |
if ($cansrchrow) { |
if ($cansrchrow) { |
$$rowtotal ++; |
$$rowtotal ++; |
$datatable .= '<tr>'; |
$datatable .= '<tr>'; |
} else { |
} else { |
$datatable .= '<tr class="LC_odd_row">'; |
$datatable .= '<tr class="LC_odd_row">'; |
} |
} |
$datatable .= '<td><span class ="LC_nobreak">'.&mt('Supported search methods'). |
$datatable .= '<td><span class ="LC_nobreak">'.&mt('Supported search methods'). |
'</span></td><td class="LC_left_item" colspan="2"><table><tr>'; |
'</span></td><td class="LC_left_item" colspan="2"><table><tr>'; |
foreach my $title (@{$titleorder}) { |
foreach my $title (@{$titleorder}) { |
if (defined($searchtitles->{$title})) { |
if (defined($searchtitles->{$title})) { |
my $check = ' '; |
my $check = ' '; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'searchby'}) eq 'ARRAY') { |
if (ref($settings->{'searchby'}) eq 'ARRAY') { |
if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) { |
if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) { |
$check = ' checked="checked" '; |
$check = ' checked="checked" '; |
} |
} |
} |
} |
} |
|
$datatable .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="searchby" '. |
|
'value="'.$title.'"'.$check.'/>'. |
|
$searchtitles->{$title}.'</label></span></td>'; |
} |
} |
$datatable .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="searchby" '. |
|
'value="'.$title.'"'.$check.'/>'. |
|
$searchtitles->{$title}.'</label></span></td>'; |
|
} |
} |
} |
$datatable .= '</tr></table></td></tr>'; |
$datatable .= '</tr></table></td></tr>'; |
$$rowtotal ++; |
$$rowtotal ++; |
if ($cansrchrow) { |
if ($cansrchrow) { |
$datatable .= '<tr class="LC_odd_row">'; |
$datatable .= '<tr class="LC_odd_row">'; |
} else { |
|
$datatable .= '<tr>'; |
|
} |
|
$datatable .= '<td><span class ="LC_nobreak">'.&mt('Search latitude').'</span></td>'. |
|
'<td class="LC_left_item" colspan="2">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="searchtypes" '. |
|
$exacton.' value="exact" />'.&mt('Exact match'). |
|
'</label> '. |
|
'<label><input type="checkbox" name="searchtypes" '. |
|
$beginson.' value="begins" />'.&mt('Begins with'). |
|
'</label> '. |
|
'<label><input type="checkbox" name="searchtypes" '. |
|
$containson.' value="contains" />'.&mt('Contains'). |
|
'</label></span></td></tr>'; |
|
$$rowtotal ++; |
} else { |
} else { |
$datatable .= '<tr>'; |
my $domsrchon = ' checked="checked" '; |
|
my $domsrchoff = ' '; |
|
my $domlocalon = ' '; |
|
my $domlocaloff = ' checked="checked" '; |
|
if (ref($settings) eq 'HASH') { |
|
if ($settings->{'lclocalonly'} eq '1') { |
|
$domlocalon = $domlocaloff; |
|
$domlocaloff = ' '; |
|
} |
|
if ($settings->{'lcavailable'} eq '0') { |
|
$domsrchoff = $domsrchon; |
|
$domsrchon = ' '; |
|
} |
|
} |
|
$datatable='<tr class="LC_odd_row">'. |
|
'<td colspan="2"><span class ="LC_nobreak">'.&mt('LON-CAPA directory search available?').'</span></td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="dirsrch_domavailable"'. |
|
$domsrchon.' value="1" />'.&mt('Yes').'</label> '. |
|
'<label><input type="radio" name="dirsrch_domavailable"'. |
|
$domsrchoff.' value="0" />'.&mt('No').'</label></span></td>'. |
|
'</tr><tr>'. |
|
'<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search LON-CAPA domain?').'</span></td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="dirsrch_domlocalonly"'. |
|
$domlocaloff.' value="0" />'.&mt('Yes').'</label> '. |
|
'<label><input type="radio" name="dirsrch_domlocalonly"'. |
|
$domlocalon.' value="1" />'.&mt('No').'</label></span></td>'. |
|
'</tr>'; |
|
$$rowtotal += 2; |
} |
} |
$datatable .= '<td><span class ="LC_nobreak">'.&mt('Search latitude').'</span></td>'. |
|
'<td class="LC_left_item" colspan="2">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="searchtypes" '. |
|
$exacton.' value="exact" />'.&mt('Exact match'). |
|
'</label> '. |
|
'<label><input type="checkbox" name="searchtypes" '. |
|
$beginson.' value="begins" />'.&mt('Begins with'). |
|
'</label> '. |
|
'<label><input type="checkbox" name="searchtypes" '. |
|
$containson.' value="contains" />'.&mt('Contains'). |
|
'</label></span></td></tr>'; |
|
$$rowtotal ++; |
|
return $datatable; |
return $datatable; |
} |
} |
|
|
sub print_contacts { |
sub print_contacts { |
my ($dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my $datatable; |
my $datatable; |
my @contacts = ('adminemail','supportemail'); |
my @contacts = ('adminemail','supportemail'); |
my (%checked,%to,%otheremails,%bccemails); |
my (%checked,%to,%otheremails,%bccemails,%includestr,%includeloc,%currfield, |
my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail', |
$maxsize,$fields,$fieldtitles,$fieldoptions,$possoptions,@mailings,%lonstatus); |
'requestsmail','updatesmail','idconflictsmail'); |
if ($position eq 'top') { |
foreach my $type (@mailings) { |
if (ref($settings) eq 'HASH') { |
$otheremails{$type} = ''; |
foreach my $item (@contacts) { |
} |
if (exists($settings->{$item})) { |
$bccemails{'helpdeskmail'} = ''; |
$to{$item} = $settings->{$item}; |
if (ref($settings) eq 'HASH') { |
} |
foreach my $item (@contacts) { |
|
if (exists($settings->{$item})) { |
|
$to{$item} = $settings->{$item}; |
|
} |
} |
} |
} |
|
} elsif ($position eq 'middle') { |
|
@mailings = ('errormail','packagesmail','lonstatusmail','requestsmail', |
|
'updatesmail','idconflictsmail','hostipmail'); |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
if (exists($settings->{$type})) { |
$otheremails{$type} = ''; |
if (ref($settings->{$type}) eq 'HASH') { |
} |
foreach my $item (@contacts) { |
} elsif ($position eq 'lower') { |
if ($settings->{$type}{$item}) { |
if (ref($settings) eq 'HASH') { |
$checked{$type}{$item} = ' checked="checked" '; |
if (ref($settings->{'lonstatus'}) eq 'HASH') { |
|
%lonstatus = %{$settings->{'lonstatus'}}; |
|
} |
|
} |
|
} else { |
|
@mailings = ('helpdeskmail','otherdomsmail'); |
|
foreach my $type (@mailings) { |
|
$otheremails{$type} = ''; |
|
} |
|
$bccemails{'helpdeskmail'} = ''; |
|
$bccemails{'otherdomsmail'} = ''; |
|
$includestr{'helpdeskmail'} = ''; |
|
$includestr{'otherdomsmail'} = ''; |
|
($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields(); |
|
} |
|
if (ref($settings) eq 'HASH') { |
|
unless (($position eq 'top') || ($position eq 'lower')) { |
|
foreach my $type (@mailings) { |
|
if (exists($settings->{$type})) { |
|
if (ref($settings->{$type}) eq 'HASH') { |
|
foreach my $item (@contacts) { |
|
if ($settings->{$type}{$item}) { |
|
$checked{$type}{$item} = ' checked="checked" '; |
|
} |
} |
} |
|
$otheremails{$type} = $settings->{$type}{'others'}; |
|
if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) { |
|
$bccemails{$type} = $settings->{$type}{'bcc'}; |
|
if ($settings->{$type}{'include'} ne '') { |
|
($includeloc{$type},$includestr{$type}) = split(/:/,$settings->{$type}{'include'},2); |
|
$includestr{$type} = &unescape($includestr{$type}); |
|
} |
|
} |
|
} |
|
} elsif ($type eq 'lonstatusmail') { |
|
$checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; |
|
} |
|
} |
|
} |
|
if ($position eq 'bottom') { |
|
foreach my $type (@mailings) { |
|
$bccemails{$type} = $settings->{$type}{'bcc'}; |
|
if ($settings->{$type}{'include'} ne '') { |
|
($includeloc{$type},$includestr{$type}) = split(/:/,$settings->{$type}{'include'},2); |
|
$includestr{$type} = &unescape($includestr{$type}); |
|
} |
|
} |
|
if (ref($settings->{'helpform'}) eq 'HASH') { |
|
if (ref($fields) eq 'ARRAY') { |
|
foreach my $field (@{$fields}) { |
|
$currfield{$field} = $settings->{'helpform'}{$field}; |
} |
} |
$otheremails{$type} = $settings->{$type}{'others'}; |
} |
if ($type eq 'helpdeskmail') { |
if (exists($settings->{'helpform'}{'maxsize'})) { |
$bccemails{$type} = $settings->{$type}{'bcc'}; |
$maxsize = $settings->{'helpform'}{'maxsize'}; |
|
} else { |
|
$maxsize = '1.0'; |
|
} |
|
} else { |
|
if (ref($fields) eq 'ARRAY') { |
|
foreach my $field (@{$fields}) { |
|
$currfield{$field} = 'yes'; |
} |
} |
} |
} |
} elsif ($type eq 'lonstatusmail') { |
$maxsize = '1.0'; |
$checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; |
|
} |
} |
} |
} |
} else { |
} else { |
$to{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
if ($position eq 'top') { |
$to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'}; |
$to{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
$checked{'errormail'}{'adminemail'} = ' checked="checked" '; |
$to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'}; |
$checked{'packagesmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'errormail'}{'adminemail'} = ' checked="checked" '; |
$checked{'helpdeskmail'}{'supportemail'} = ' 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" '; |
|
$checked{'hostipmail'}{'adminemail'} = ' checked="checked" '; |
|
} elsif ($position eq 'bottom') { |
|
$checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" '; |
|
$checked{'otherdomsmail'}{'supportemail'} = ' checked="checked" '; |
|
if (ref($fields) eq 'ARRAY') { |
|
foreach my $field (@{$fields}) { |
|
$currfield{$field} = 'yes'; |
|
} |
|
} |
|
$maxsize = '1.0'; |
|
} |
} |
} |
my ($titles,$short_titles) = &contact_titles(); |
my ($titles,$short_titles) = &contact_titles(); |
my $rownum = 0; |
my $rownum = 0; |
my $css_class; |
my $css_class; |
foreach my $item (@contacts) { |
if ($position eq 'top') { |
|
foreach my $item (@contacts) { |
|
$css_class = $rownum%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td><span class="LC_nobreak">'.$titles->{$item}. |
|
'</span></td><td class="LC_right_item">'. |
|
'<input type="text" name="'.$item.'" value="'. |
|
$to{$item}.'" /></td></tr>'; |
|
$rownum ++; |
|
} |
|
} elsif ($position eq 'bottom') { |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td><span class="LC_nobreak">'.$titles->{$item}. |
'<td>'.&mt('Extra helpdesk form fields:').'<br />'. |
'</span></td><td class="LC_right_item">'. |
&mt('(e-mail, subject, and description always shown)'). |
'<input type="text" name="'.$item.'" value="'. |
'</td><td class="LC_left_item">'; |
$to{$item}.'" /></td></tr>'; |
if ((ref($fields) eq 'ARRAY') && (ref($fieldtitles) eq 'HASH') && |
|
(ref($fieldoptions) eq 'HASH') && (ref($possoptions) eq 'HASH')) { |
|
$datatable .= '<table><tr><th>'.&mt('Field').'</th><th>'.&mt('Status').'</th></tr>'; |
|
foreach my $field (@{$fields}) { |
|
$datatable .= '<tr><td>'.$fieldtitles->{$field}; |
|
if (($field eq 'screenshot') || ($field eq 'cc')) { |
|
$datatable .= ' '.&mt('(logged-in users)'); |
|
} |
|
$datatable .='</td><td>'; |
|
my $clickaction; |
|
if ($field eq 'screenshot') { |
|
$clickaction = ' onclick="screenshotSize(this);"'; |
|
} |
|
if (ref($possoptions->{$field}) eq 'ARRAY') { |
|
foreach my $option (@{$possoptions->{$field}}) { |
|
my $checked; |
|
if ($currfield{$field} eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="helpform_'.$field.'" '. |
|
'value="'.$option.'"'.$checked.$clickaction.' />'.$fieldoptions->{$option}. |
|
'</label></span>'.(' 'x2); |
|
} |
|
} |
|
if ($field eq 'screenshot') { |
|
my $display; |
|
if ($currfield{$field} eq 'no') { |
|
$display = ' style="display:none"'; |
|
} |
|
$datatable .= '</td></tr><tr id="help_screenshotsize"'.$display.'>'. |
|
'<td>'.&mt('Maximum size for upload (MB)').'</td><td>'. |
|
'<input type="text" size="5" name="helpform_maxsize" value="'.$maxsize.'" />'; |
|
} |
|
$datatable .= '</td></tr>'; |
|
} |
|
$datatable .= '</table>'; |
|
} |
|
$datatable .= '</td></tr>'."\n"; |
$rownum ++; |
$rownum ++; |
} |
} |
foreach my $type (@mailings) { |
unless (($position eq 'top') || ($position eq 'lower')) { |
|
foreach my $type (@mailings) { |
|
$css_class = $rownum%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td><span class="LC_nobreak">'. |
|
$titles->{$type}.': </span></td>'. |
|
'<td class="LC_left_item">'; |
|
if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) { |
|
$datatable .= '<fieldset><legend>'.&mt('E-mail recipient(s)').'</legend>'; |
|
} |
|
$datatable .= '<span class="LC_nobreak">'; |
|
foreach my $item (@contacts) { |
|
$datatable .= '<label>'. |
|
'<input type="checkbox" name="'.$type.'"'. |
|
$checked{$type}{$item}. |
|
' value="'.$item.'" />'.$short_titles->{$item}. |
|
'</label> '; |
|
} |
|
$datatable .= '</span><br />'.&mt('Others').': '. |
|
'<input type="text" name="'.$type.'_others" '. |
|
'value="'.$otheremails{$type}.'" />'; |
|
my %locchecked; |
|
if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) { |
|
foreach my $loc ('s','b') { |
|
if ($includeloc{$type} eq $loc) { |
|
$locchecked{$loc} = ' checked="checked"'; |
|
last; |
|
} |
|
} |
|
$datatable .= '<br />'.&mt('Bcc:').(' 'x6). |
|
'<input type="text" name="'.$type.'_bcc" '. |
|
'value="'.$bccemails{$type}.'" /></fieldset>'. |
|
'<fieldset><legend>'.&mt('Optional added text').'</legend>'. |
|
&mt('Text automatically added to e-mail:').' '. |
|
'<input type="text" name="'.$type.'_includestr" value="'.$includestr{$type}.'" /><br />'. |
|
'<span class="LC_nobreak">'.&mt('Location:').' '. |
|
'<label><input type="radio" name="'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'. |
|
(' 'x2). |
|
'<label><input type="radio" name="'.$type.'_includeloc" value="b"'.$locchecked{'b'}.' />'.&mt('in body').'</label>'. |
|
'</span></fieldset>'; |
|
} |
|
$datatable .= '</td></tr>'."\n"; |
|
$rownum ++; |
|
} |
|
} |
|
if ($position eq 'middle') { |
|
my %choices; |
|
my $corelink = &core_link_msu(); |
|
$choices{'reporterrors'} = &mt('E-mail error reports to [_1]',$corelink); |
|
$choices{'reportupdates'} = &mt('E-mail record of completed LON-CAPA updates to [_1]', |
|
$corelink); |
|
$choices{'reportstatus'} = &mt('E-mail status if errors above threshold to [_1]',$corelink); |
|
my @toggles = ('reporterrors','reportupdates','reportstatus'); |
|
my %defaultchecked = ('reporterrors' => 'on', |
|
'reportupdates' => 'on', |
|
'reportstatus' => 'on'); |
|
(my $reports,$rownum) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
|
\%choices,$rownum); |
|
$datatable .= $reports; |
|
} elsif ($position eq 'lower') { |
|
my (%current,%excluded,%weights); |
|
my ($defaults,$names) = &Apache::loncommon::lon_status_items(); |
|
if ($lonstatus{'threshold'} =~ /^\d+$/) { |
|
$current{'errorthreshold'} = $lonstatus{'threshold'}; |
|
} else { |
|
$current{'errorthreshold'} = $defaults->{'threshold'}; |
|
} |
|
if ($lonstatus{'sysmail'} =~ /^\d+$/) { |
|
$current{'errorsysmail'} = $lonstatus{'sysmail'}; |
|
} else { |
|
$current{'errorsysmail'} = $defaults->{'sysmail'}; |
|
} |
|
if (ref($lonstatus{'weights'}) eq 'HASH') { |
|
foreach my $type ('E','W','N','U') { |
|
if ($lonstatus{'weights'}{$type} =~ /^\d+$/) { |
|
$weights{$type} = $lonstatus{'weights'}{$type}; |
|
} else { |
|
$weights{$type} = $defaults->{$type}; |
|
} |
|
} |
|
} else { |
|
foreach my $type ('E','W','N','U') { |
|
$weights{$type} = $defaults->{$type}; |
|
} |
|
} |
|
if (ref($lonstatus{'excluded'}) eq 'ARRAY') { |
|
if (@{$lonstatus{'excluded'}} > 0) { |
|
map {$excluded{$_} = 1; } @{$lonstatus{'excluded'}}; |
|
} |
|
} |
|
foreach my $item ('errorthreshold','errorsysmail') { |
|
$css_class = $rownum%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak">'. |
|
$titles->{$item}. |
|
'</span></td><td class="LC_left_item">'. |
|
'<input type="text" name="'.$item.'" value="'. |
|
$current{$item}.'" size="5" /></td></tr>'; |
|
$rownum ++; |
|
} |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td><span class="LC_nobreak">'. |
|
$titles->{$type}.': </span></td>'. |
|
'<td class="LC_left_item">'. |
'<td class="LC_left_item">'. |
'<span class="LC_nobreak">'; |
'<span class="LC_nobreak">'.$titles->{'errorweights'}. |
foreach my $item (@contacts) { |
'</span></td><td class="LC_left_item"><table><tr>'; |
$datatable .= '<label>'. |
foreach my $type ('E','W','N','U') { |
'<input type="checkbox" name="'.$type.'"'. |
$datatable .= '<td>'.$names->{$type}.'<br />'. |
$checked{$type}{$item}. |
'<input type="text" name="errorweights_'.$type.'" value="'. |
' value="'.$item.'" />'.$short_titles->{$item}. |
$weights{$type}.'" size="5" /></td>'; |
'</label> '; |
|
} |
|
$datatable .= '</span><br />'.&mt('Others').': '. |
|
'<input type="text" name="'.$type.'_others" '. |
|
'value="'.$otheremails{$type}.'" />'; |
|
if ($type eq 'helpdeskmail') { |
|
$datatable .= '<br />'.&mt('Bcc:').(' 'x6). |
|
'<input type="text" name="'.$type.'_bcc" '. |
|
'value="'.$bccemails{$type}.'" />'; |
|
} |
} |
$datatable .= '</td></tr>'."\n"; |
$datatable .= '</tr></table></tr>'; |
$rownum ++; |
$rownum ++; |
|
$css_class = $rownum%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td class="LC_left_item">'. |
|
$titles->{'errorexcluded'}.'</td>'. |
|
'<td class="LC_left_item"><table>'; |
|
my $numinrow = 4; |
|
my @ids = sort(values(%Apache::lonnet::serverhomeIDs)); |
|
for (my $i=0; $i<@ids; $i++) { |
|
my $rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
} |
|
my $check; |
|
if ($excluded{$ids[$i]}) { |
|
$check = ' checked="checked" '; |
|
} |
|
$datatable .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="errorexcluded" '. |
|
'value="'.$ids[$i].'"'.$check.' />'. |
|
$ids[$i].'</label></span></td>'; |
|
} |
|
my $colsleft = $numinrow - @ids%($numinrow); |
|
if ($colsleft > 1 ) { |
|
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
|
' </td>'; |
|
} elsif ($colsleft == 1) { |
|
$datatable .= '<td class="LC_left_item"> </td>'; |
|
} |
|
$datatable .= '</tr></table></td></tr>'; |
|
$rownum ++; |
|
} elsif ($position eq 'bottom') { |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
my (@posstypes,%usertypeshash); |
|
if (ref($types) eq 'ARRAY') { |
|
@posstypes = @{$types}; |
|
} |
|
if (@posstypes) { |
|
if (ref($usertypes) eq 'HASH') { |
|
%usertypeshash = %{$usertypes}; |
|
} |
|
my @overridden; |
|
my $numinrow = 4; |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{'overrides'}) eq 'HASH') { |
|
foreach my $key (sort(keys(%{$settings->{'overrides'}}))) { |
|
if (ref($settings->{'overrides'}{$key}) eq 'HASH') { |
|
push(@overridden,$key); |
|
foreach my $item (@contacts) { |
|
if ($settings->{'overrides'}{$key}{$item}) { |
|
$checked{'override_'.$key}{$item} = ' checked="checked" '; |
|
} |
|
} |
|
$otheremails{'override_'.$key} = $settings->{'overrides'}{$key}{'others'}; |
|
$bccemails{'override_'.$key} = $settings->{'overrides'}{$key}{'bcc'}; |
|
$includeloc{'override_'.$key} = ''; |
|
$includestr{'override_'.$key} = ''; |
|
if ($settings->{'overrides'}{$key}{'include'} ne '') { |
|
($includeloc{'override_'.$key},$includestr{'override_'.$key}) = |
|
split(/:/,$settings->{'overrides'}{$key}{'include'},2); |
|
$includestr{'override_'.$key} = &unescape($includestr{'override_'.$key}); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
my $customclass = 'LC_helpdesk_override'; |
|
my $optionsprefix = 'LC_options_helpdesk_'; |
|
|
|
my $onclicktypes = "toggleHelpdeskRow(this.form,'overrides','$customclass','$optionsprefix');"; |
|
|
|
$datatable .= &insttypes_row($settings,$types,$usertypes,$dom, |
|
$numinrow,$othertitle,'overrides', |
|
\$rownum,$onclicktypes,$customclass); |
|
$rownum ++; |
|
$usertypeshash{'default'} = $othertitle; |
|
foreach my $status (@posstypes) { |
|
my $css_class; |
|
if ($rownum%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$/,@overridden)) { |
|
$currstyle = 'display:table-row'; |
|
$hidden = 0; |
|
} |
|
my $key = 'override_'.$status; |
|
$datatable .= &overridden_helpdesk($checked{$key},$otheremails{$key},$bccemails{$key}, |
|
$includeloc{$key},$includestr{$key},$status,$rowid, |
|
$usertypeshash{$status},$css_class,$currstyle, |
|
\@contacts,$short_titles); |
|
unless ($hidden) { |
|
$rownum ++; |
|
} |
|
} |
|
} |
} |
} |
my %choices; |
|
$choices{'reporterrors'} = &mt('E-mail error reports to [_1]', |
|
&Apache::loncommon::modal_link('http://loncapa.org/core.html', |
|
&mt('LON-CAPA core group - MSU'),600,500)); |
|
$choices{'reportupdates'} = &mt('E-mail record of completed LON-CAPA updates to [_1]', |
|
&Apache::loncommon::modal_link('http://loncapa.org/core.html', |
|
&mt('LON-CAPA core group - MSU'),600,500)); |
|
my @toggles = ('reporterrors','reportupdates'); |
|
my %defaultchecked = ('reporterrors' => 'on', |
|
'reportupdates' => 'on'); |
|
(my $reports,$rownum) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
|
\%choices,$rownum); |
|
$datatable .= $reports; |
|
$$rowtotal += $rownum; |
$$rowtotal += $rownum; |
return $datatable; |
return $datatable; |
} |
} |
|
|
|
sub core_link_msu { |
|
return &Apache::loncommon::modal_link('http://loncapa.org/core.html', |
|
&mt('LON-CAPA core group - MSU'),600,500); |
|
} |
|
|
|
sub overridden_helpdesk { |
|
my ($checked,$otheremails,$bccemails,$includeloc,$includestr,$type,$rowid, |
|
$typetitle,$css_class,$rowstyle,$contacts,$short_titles) = @_; |
|
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); |
|
$description = &mt('Helpdesk requests from: [_1] in this domain (overrides default)',"<b>$typetitle</b>"); |
|
$output = '<tr'.$css_class.$rowid.$rowstyle.'>'. |
|
"<td>$description</td>\n". |
|
'<td class="'.$class.'" colspan="2">'. |
|
'<fieldset><legend>'.&mt('E-mail recipient(s)').'</legend>'. |
|
'<span class="LC_nobreak">'; |
|
if (ref($contacts) eq 'ARRAY') { |
|
foreach my $item (@{$contacts}) { |
|
my $check; |
|
if (ref($checked) eq 'HASH') { |
|
$check = $checked->{$item}; |
|
} |
|
my $title; |
|
if (ref($short_titles) eq 'HASH') { |
|
$title = $short_titles->{$item}; |
|
} |
|
$output .= '<label>'. |
|
'<input type="checkbox" name="override_'.$type.'"'.$check. |
|
' value="'.$item.'" />'.$title.'</label> '; |
|
} |
|
} |
|
$output .= '</span><br />'.&mt('Others').': '. |
|
'<input type="text" name="override_'.$type.'_others" '. |
|
'value="'.$otheremails.'" />'; |
|
my %locchecked; |
|
foreach my $loc ('s','b') { |
|
if ($includeloc eq $loc) { |
|
$locchecked{$loc} = ' checked="checked"'; |
|
last; |
|
} |
|
} |
|
$output .= '<br />'.&mt('Bcc:').(' 'x6). |
|
'<input type="text" name="override_'.$type.'_bcc" '. |
|
'value="'.$bccemails.'" /></fieldset>'. |
|
'<fieldset><legend>'.&mt('Optional added text').'</legend>'. |
|
&mt('Text automatically added to e-mail:').' '. |
|
'<input type="text" name="override_'.$type.'_includestr" value="'.$includestr.'" /><br />'. |
|
'<span class="LC_nobreak">'.&mt('Location:').' '. |
|
'<label><input type="radio" name="override_'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'. |
|
(' 'x2). |
|
'<label><input type="radio" name="override_'.$type.'_includeloc" value="b"'.$locchecked{'b'}.' />'.&mt('in body').'</label>'. |
|
'</span></fieldset>'. |
|
'</td></tr>'."\n"; |
|
return $output; |
|
} |
|
|
|
sub contacts_javascript { |
|
return <<"ENDSCRIPT"; |
|
|
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
|
|
function screenshotSize(field) { |
|
if (document.getElementById('help_screenshotsize')) { |
|
if (field.value == 'no') { |
|
document.getElementById('help_screenshotsize').style.display="none"; |
|
} else { |
|
document.getElementById('help_screenshotsize').style.display=""; |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function toggleHelpdeskRow(form,checkbox,target,prefix,docount) { |
|
if (form.elements[checkbox].length != undefined) { |
|
var count = 0; |
|
if (docount) { |
|
for (var i=0; i<form.elements[checkbox].length; i++) { |
|
if (form.elements[checkbox][i].checked) { |
|
count ++; |
|
} |
|
} |
|
} |
|
for (var i=0; i<form.elements[checkbox].length; i++) { |
|
var type = form.elements[checkbox][i].value; |
|
if (document.getElementById(prefix+type)) { |
|
if (form.elements[checkbox][i].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 { |
|
document.getElementById(prefix+type).style.display = 'none'; |
|
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
sub print_helpsettings { |
sub print_helpsettings { |
my ($dom,$confname,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
|
my $confname = $dom.'-domainconfig'; |
|
my $formname = 'display'; |
my ($datatable,$itemcount); |
my ($datatable,$itemcount); |
$itemcount = 1; |
if ($position eq 'top') { |
my (%choices,%defaultchecked,@toggles); |
$itemcount = 1; |
$choices{'submitbugs'} = &mt('Display link to: [_1]?', |
my (%choices,%defaultchecked,@toggles); |
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
$choices{'submitbugs'} = &mt('Display link to: [_1]?', |
&mt('LON-CAPA bug tracker'),600,500)); |
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
%defaultchecked = ('submitbugs' => 'on'); |
&mt('LON-CAPA bug tracker'),600,500)); |
@toggles = ('submitbugs',); |
%defaultchecked = ('submitbugs' => 'on'); |
|
@toggles = ('submitbugs'); |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
\%choices,$itemcount); |
\%choices,$itemcount); |
|
$$rowtotal ++; |
|
} else { |
|
my $css_class; |
|
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
|
my (%customroles,%ordered,%current); |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{'adhoc'}) eq 'HASH') { |
|
%current = %{$settings->{'adhoc'}}; |
|
} |
|
} |
|
my $count = 0; |
|
foreach my $key (sort(keys(%existing))) { |
|
if ($key=~/^rolesdef\_(\w+)$/) { |
|
my $rolename = $1; |
|
my (%privs,$order); |
|
($privs{'system'},$privs{'domain'},$privs{'course'}) = split(/\_/,$existing{$key}); |
|
$customroles{$rolename} = \%privs; |
|
if (ref($current{$rolename}) eq 'HASH') { |
|
$order = $current{$rolename}{'order'}; |
|
} |
|
if ($order eq '') { |
|
$order = $count; |
|
} |
|
$ordered{$order} = $rolename; |
|
$count++; |
|
} |
|
} |
|
my $maxnum = scalar(keys(%ordered)); |
|
my @roles_by_num = (); |
|
foreach my $item (sort {$a <=> $b } (keys(%ordered))) { |
|
push(@roles_by_num,$item); |
|
} |
|
my $context = 'domprefs'; |
|
my $crstype = 'Course'; |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
my @accesstypes = ('all','dh','da','none'); |
|
my ($numstatustypes,@jsarray); |
|
if (ref($types) eq 'ARRAY') { |
|
if (@{$types} > 0) { |
|
$numstatustypes = scalar(@{$types}); |
|
push(@accesstypes,'status'); |
|
@jsarray = ('bystatus'); |
|
} |
|
} |
|
my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']); |
|
if (keys(%domhelpdesk)) { |
|
push(@accesstypes,('inc','exc')); |
|
push(@jsarray,('notinc','notexc')); |
|
} |
|
my $hiddenstr = join("','",@jsarray); |
|
$datatable .= &helpsettings_javascript(\@roles_by_num,$maxnum,$hiddenstr,$formname); |
|
my $context = 'domprefs'; |
|
my $crstype = 'Course'; |
|
my $prefix = 'helproles_'; |
|
my $add_class = 'LC_hidden'; |
|
foreach my $num (@roles_by_num) { |
|
my $role = $ordered{$num}; |
|
my ($desc,$access,@statuses); |
|
if (ref($current{$role}) eq 'HASH') { |
|
$desc = $current{$role}{'desc'}; |
|
$access = $current{$role}{'access'}; |
|
if (ref($current{$role}{'insttypes'}) eq 'ARRAY') { |
|
@statuses = @{$current{$role}{'insttypes'}}; |
|
} |
|
} |
|
if ($desc eq '') { |
|
$desc = $role; |
|
} |
|
my $identifier = 'custhelp'.$num; |
|
my %full=(); |
|
my %levels= ( |
|
course => {}, |
|
domain => {}, |
|
system => {}, |
|
); |
|
my %levelscurrent=( |
|
course => {}, |
|
domain => {}, |
|
system => {}, |
|
); |
|
&Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent); |
|
my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype); |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
my $chgstr = ' onchange="javascript:reorderHelpRoles(this.form,'."'helproles_".$num."_pos'".');"'; |
|
$datatable .= '<tr '.$css_class.'><td valign="top"><b>'.$role.'</b><br />'. |
|
'<select name="helproles_'.$num.'_pos"'.$chgstr.'>'; |
|
for (my $k=0; $k<=$maxnum; $k++) { |
|
my $vpos = $k+1; |
|
my $selstr; |
|
if ($k == $num) { |
|
$selstr = ' selected="selected" '; |
|
} |
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
|
} |
|
$datatable .= '</select>'.(' 'x2). |
|
'<input type="hidden" name="helproles_'.$num.'" value="'.$role.'" />'. |
|
'</td>'. |
|
'<td><fieldset><legend>'.&mt('Role name').'</legend>'. |
|
&mt('Name shown to users:'). |
|
'<input type="text" name="helproles_'.$num.'_desc" value="'.$desc.'" />'. |
|
'</fieldset>'. |
|
&helpdeskroles_access($dom,$prefix,$num,$add_class,$current{$role},\@accesstypes, |
|
$othertitle,$usertypes,$types,\%domhelpdesk). |
|
'<fieldset>'. |
|
'<legend>'.&mt('Role privileges').&adhocbutton($prefix,$num,'privs','show').'</legend>'. |
|
&Apache::lonuserutils::custom_role_table($crstype,\%full,\%levels, |
|
\%levelscurrent,$identifier, |
|
'LC_hidden',$prefix.$num.'_privs'). |
|
'</fieldset></td>'; |
|
$itemcount ++; |
|
} |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
my $newcust = 'custhelp'.$count; |
|
my (%privs,%levelscurrent); |
|
my %full=(); |
|
my %levels= ( |
|
course => {}, |
|
domain => {}, |
|
system => {}, |
|
); |
|
&Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent); |
|
my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype); |
|
my $chgstr = ' onchange="javascript:reorderHelpRoles(this.form,'."'helproles_".$count."_pos'".');"'; |
|
$datatable .= '<tr '.$css_class.'><td valign="top"><span class="LC_nobreak"><label>'. |
|
'<input type="hidden" name="helproles_maxnum" value="'.$maxnum.'" />'."\n". |
|
'<select name="helproles_'.$count.'_pos"'.$chgstr.'>'; |
|
for (my $k=0; $k<$maxnum+1; $k++) { |
|
my $vpos = $k+1; |
|
my $selstr; |
|
if ($k == $maxnum) { |
|
$selstr = ' selected="selected" '; |
|
} |
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
|
} |
|
$datatable .= '</select> '."\n". |
|
'<input type="checkbox" name="newcusthelp" value="'.$count.'" />'. &mt('Add'). |
|
'</label></span></td>'. |
|
'<td><fieldset><legend>'.&mt('Role name').'</legend>'. |
|
'<span class="LC_nobreak">'. |
|
&mt('Internal name:'). |
|
'<input type="text" size="10" name="custhelpname'.$count.'" value="" />'. |
|
'</span>'.(' 'x4). |
|
'<span class="LC_nobreak">'. |
|
&mt('Name shown to users:'). |
|
'<input type="text" size="20" name="helproles_'.$count.'_desc" value="" />'. |
|
'</span></fieldset>'. |
|
&helpdeskroles_access($dom,$prefix,$count,'',undef,\@accesstypes,$othertitle, |
|
$usertypes,$types,\%domhelpdesk). |
|
'<fieldset><legend>'.&mt('Role privileges').'</legend>'. |
|
&Apache::lonuserutils::custom_role_header($context,$crstype, |
|
\@templateroles,$newcust). |
|
&Apache::lonuserutils::custom_role_table('Course',\%full,\%levels, |
|
\%levelscurrent,$newcust). |
|
'</fieldset>'. |
|
&helpsettings_javascript(\@roles_by_num,$maxnum,$hiddenstr,$formname). |
|
'</td></tr>'; |
|
$count ++; |
|
$$rowtotal += $count; |
|
} |
return $datatable; |
return $datatable; |
} |
} |
|
|
|
sub adhocbutton { |
|
my ($prefix,$num,$field,$visibility) = @_; |
|
my %lt = &Apache::lonlocal::texthash( |
|
show => 'Show details', |
|
hide => 'Hide details', |
|
); |
|
return '<span style="text-decoration:line-through; font-weight: normal;">'.(' 'x10). |
|
'</span>'.(' 'x2).'<input type="button" id="'.$prefix.$num.'_'.$field.'_vis"'. |
|
' value="'.$lt{$visibility}.'" style="height:20px;" '. |
|
'onclick="toggleHelpdeskItem('."'$num','$field'".');" />'.(' 'x2); |
|
} |
|
|
|
sub helpsettings_javascript { |
|
my ($roles_by_num,$total,$hiddenstr,$formname) = @_; |
|
return unless(ref($roles_by_num) eq 'ARRAY'); |
|
my %html_js_lt = &Apache::lonlocal::texthash( |
|
show => 'Show details', |
|
hide => 'Hide details', |
|
); |
|
&html_escape(\%html_js_lt); |
|
my $jstext = ' var helproles = Array('."'".join("','",@{$roles_by_num})."'".');'."\n"; |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
|
|
function reorderHelpRoles(form,item) { |
|
var changedVal; |
|
$jstext |
|
var newpos = 'helproles_${total}_pos'; |
|
var maxh = 1 + $total; |
|
var current = new Array(); |
|
var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value; |
|
if (item == newpos) { |
|
changedVal = newitemVal; |
|
} else { |
|
changedVal = form.elements[item].options[form.elements[item].selectedIndex].value; |
|
current[newitemVal] = newpos; |
|
} |
|
for (var i=0; i<helproles.length; i++) { |
|
var elementName = 'helproles_'+helproles[i]+'_pos'; |
|
if (elementName != item) { |
|
if (form.elements[elementName]) { |
|
var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; |
|
current[currVal] = elementName; |
|
} |
|
} |
|
} |
|
var oldVal; |
|
for (var j=0; j<maxh; j++) { |
|
if (current[j] == undefined) { |
|
oldVal = j; |
|
} |
|
} |
|
if (oldVal < changedVal) { |
|
for (var k=oldVal+1; k<=changedVal ; k++) { |
|
var elementName = current[k]; |
|
form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex - 1; |
|
} |
|
} else { |
|
for (var k=changedVal; k<oldVal; k++) { |
|
var elementName = current[k]; |
|
form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1; |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function helpdeskAccess(num) { |
|
var curraccess = null; |
|
if (document.$formname.elements['helproles_'+num+'_access'].length) { |
|
for (var i=0; i<document.$formname.elements['helproles_'+num+'_access'].length; i++) { |
|
if (document.$formname.elements['helproles_'+num+'_access'][i].checked) { |
|
curraccess = document.$formname.elements['helproles_'+num+'_access'][i].value; |
|
} |
|
} |
|
} |
|
var shown = Array(); |
|
var hidden = Array(); |
|
if (curraccess == 'none') { |
|
hidden = Array('$hiddenstr'); |
|
} else { |
|
if (curraccess == 'status') { |
|
shown = Array('bystatus'); |
|
hidden = Array('notinc','notexc'); |
|
} else { |
|
if (curraccess == 'exc') { |
|
shown = Array('notexc'); |
|
hidden = Array('notinc','bystatus'); |
|
} |
|
if (curraccess == 'inc') { |
|
shown = Array('notinc'); |
|
hidden = Array('notexc','bystatus'); |
|
} |
|
if ((curraccess == 'all') || (curraccess == 'dh') || (curraccess == 'da')) { |
|
hidden = Array('notinc','notexc','bystatus'); |
|
} |
|
} |
|
} |
|
if (hidden.length > 0) { |
|
for (var i=0; i<hidden.length; i++) { |
|
if (document.getElementById('helproles_'+num+'_'+hidden[i])) { |
|
document.getElementById('helproles_'+num+'_'+hidden[i]).style.display = 'none'; |
|
} |
|
} |
|
} |
|
if (shown.length > 0) { |
|
for (var i=0; i<shown.length; i++) { |
|
if (document.getElementById('helproles_'+num+'_'+shown[i])) { |
|
if (shown[i] == 'privs') { |
|
document.getElementById('helproles_'+num+'_'+shown[i]).style.display = 'block'; |
|
} else { |
|
document.getElementById('helproles_'+num+'_'+shown[i]).style.display = 'inline-block'; |
|
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function toggleHelpdeskItem(num,field) { |
|
if (document.getElementById('helproles_'+num+'_'+field)) { |
|
if (document.getElementById('helproles_'+num+'_'+field).className.match(/(?:^|\\s)LC_hidden(?!\\S)/)) { |
|
document.getElementById('helproles_'+num+'_'+field).className = |
|
document.getElementById('helproles_'+num+'_'+field).className.replace(/(?:^|\\s)LC_hidden(?!\\S)/g ,''); |
|
if (document.getElementById('helproles_'+num+'_'+field+'_vis')) { |
|
document.getElementById('helproles_'+num+'_'+field+'_vis').value = '$html_js_lt{hide}'; |
|
} |
|
} else { |
|
document.getElementById('helproles_'+num+'_'+field).className += ' LC_hidden'; |
|
if (document.getElementById('helproles_'+num+'_'+field+'_vis')) { |
|
document.getElementById('helproles_'+num+'_'+field+'_vis').value = '$html_js_lt{show}'; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
|
sub helpdeskroles_access { |
|
my ($dom,$prefix,$num,$add_class,$current,$accesstypes,$othertitle, |
|
$usertypes,$types,$domhelpdesk) = @_; |
|
return unless ((ref($accesstypes) eq 'ARRAY') && (ref($domhelpdesk) eq 'HASH')); |
|
my %lt = &Apache::lonlocal::texthash( |
|
'rou' => 'Role usage', |
|
'whi' => 'Which helpdesk personnel may use this role?', |
|
'all' => 'All with domain helpdesk or helpdesk assistant role', |
|
'dh' => 'All with domain helpdesk role', |
|
'da' => 'All with domain helpdesk assistant role', |
|
'none' => 'None', |
|
'status' => 'Determined based on institutional status', |
|
'inc' => 'Include all, but exclude specific personnel', |
|
'exc' => 'Exclude all, but include specific personnel', |
|
); |
|
my %usecheck = ( |
|
all => ' checked="checked"', |
|
); |
|
my %displaydiv = ( |
|
status => 'none', |
|
inc => 'none', |
|
exc => 'none', |
|
priv => 'block', |
|
); |
|
my $output; |
|
if (ref($current) eq 'HASH') { |
|
if (($current->{'access'} ne '') && ($current->{'access'} ne 'all')) { |
|
if (grep(/^\Q$current->{access}\E$/,@{$accesstypes})) { |
|
$usecheck{$current->{access}} = $usecheck{'all'}; |
|
delete($usecheck{'all'}); |
|
if ($current->{access} =~ /^(status|inc|exc)$/) { |
|
my $access = $1; |
|
$displaydiv{$access} = 'inline'; |
|
} elsif ($current->{access} eq 'none') { |
|
$displaydiv{'priv'} = 'none'; |
|
} |
|
} |
|
} |
|
} |
|
$output = '<fieldset id="'.$prefix.$num.'_usage"><legend>'.$lt{'rou'}.'</legend>'. |
|
'<p>'.$lt{'whi'}.'</p>'; |
|
foreach my $access (@{$accesstypes}) { |
|
$output .= '<p><label><input type="radio" name="'.$prefix.$num.'_access" value="'.$access.'" '.$usecheck{$access}. |
|
' onclick="helpdeskAccess('."'$num'".');" />'. |
|
$lt{$access}.'</label>'; |
|
if ($access eq 'status') { |
|
$output .= '<div id="'.$prefix.$num.'_bystatus" style="display:'.$displaydiv{$access}.'">'. |
|
&Apache::lonuserutils::adhoc_status_types($dom,$prefix,$num,$current->{$access}, |
|
$othertitle,$usertypes,$types). |
|
'</div>'; |
|
} elsif (($access eq 'inc') && (keys(%{$domhelpdesk}) > 0)) { |
|
$output .= '<div id="'.$prefix.$num.'_notinc" style="display:'.$displaydiv{$access}.'">'. |
|
&Apache::lonuserutils::adhoc_staff($access,$prefix,$num,$current->{$access},$domhelpdesk). |
|
'</div>'; |
|
} elsif (($access eq 'exc') && (keys(%{$domhelpdesk}) > 0)) { |
|
$output .= '<div id="'.$prefix.$num.'_notexc" style="display:'.$displaydiv{$access}.'">'. |
|
&Apache::lonuserutils::adhoc_staff($access,$prefix,$num,$current->{$access},$domhelpdesk). |
|
'</div>'; |
|
} |
|
$output .= '</p>'; |
|
} |
|
$output .= '</fieldset>'; |
|
return $output; |
|
} |
|
|
sub radiobutton_prefs { |
sub radiobutton_prefs { |
my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick, |
my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick, |
$additional) = @_; |
$additional,$align,$firstval) = @_; |
return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && |
return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && |
(ref($choices) eq 'HASH')); |
(ref($choices) eq 'HASH')); |
|
|
Line 2719 sub radiobutton_prefs {
|
Line 4489 sub radiobutton_prefs {
|
$datatable .= |
$datatable .= |
'<tr'.$css_class.'><td valign="top">'. |
'<tr'.$css_class.'><td valign="top">'. |
'<span class="LC_nobreak">'.$choices->{$item}. |
'<span class="LC_nobreak">'.$choices->{$item}. |
'</span></td>'. |
'</span></td>'; |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
if ($align eq 'left') { |
|
$datatable .= '<td class="LC_left_item">'; |
|
} else { |
|
$datatable .= '<td class="LC_right_item">'; |
|
} |
|
$datatable .= '<span class="LC_nobreak">'; |
|
if ($firstval eq 'no') { |
|
$datatable .= |
|
'<label><input type="radio" name="'. |
|
$item.'" '.$checkedoff{$item}.' value="0"'.$onclick.' />'.&mt('No'). |
|
'</label> <label><input type="radio" name="'.$item.'" '. |
|
$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes').'</label>'; |
|
} else { |
|
$datatable .= |
'<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'). |
'</label> <label><input type="radio" name="'.$item.'" '. |
'</label> <label><input type="radio" name="'.$item.'" '. |
$checkedoff{$item}.' value="0"'.$onclick.' />'.&mt('No').'</label>'. |
$checkedoff{$item}.' value="0"'.$onclick.' />'.&mt('No').'</label>'; |
'</span>'.$additional. |
} |
'</td>'. |
$datatable .= '</span>'.$additional.'</td></tr>'; |
'</tr>'; |
|
$itemcount ++; |
$itemcount ++; |
} |
} |
return ($datatable,$itemcount); |
return ($datatable,$itemcount); |
Line 2738 sub print_coursedefaults {
|
Line 4520 sub print_coursedefaults {
|
my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles); |
my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles); |
my $itemcount = 1; |
my $itemcount = 1; |
my %choices = &Apache::lonlocal::texthash ( |
my %choices = &Apache::lonlocal::texthash ( |
canuse_pdfforms => 'Course/Community users can create/upload PDF forms', |
|
uploadquota => 'Default quota for files uploaded directly to course/community using Course Editor (MB)', |
uploadquota => 'Default quota for files uploaded directly to course/community using Course Editor (MB)', |
anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys', |
anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys', |
coursecredits => 'Credits can be specified for courses', |
coursecredits => 'Credits can be specified for courses', |
|
uselcmath => 'Math preview uses LON-CAPA previewer (javascript) in place of DragMath (Java)', |
|
usejsme => 'Molecule editor uses JSME (HTML5) in place of JME (Java)', |
|
inline_chem => 'Use inline previewer for chemical reaction response in place of pop-up', |
|
texengine => 'Default method to display mathematics', |
|
postsubmit => 'Disable submit button/keypress following student submission', |
|
canclone => "People who may clone a course (besides course's owner and coordinators)", |
|
mysqltables => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver', |
); |
); |
my %staticdefaults = ( |
my %staticdefaults = ( |
anonsurvey_threshold => 10, |
anonsurvey_threshold => 10, |
uploadquota => 500, |
uploadquota => 500, |
|
postsubmit => 60, |
|
mysqltables => 172800, |
); |
); |
if ($position eq 'top') { |
if ($position eq 'top') { |
%defaultchecked = ('canuse_pdfforms' => 'off'); |
%defaultchecked = ( |
@toggles = ('canuse_pdfforms'); |
'uselcmath' => 'on', |
|
'usejsme' => 'on', |
|
'inline_chem' => 'on', |
|
'canclone' => 'none', |
|
); |
|
@toggles = ('uselcmath','usejsme','inline_chem'); |
|
my $deftex = $Apache::lonnet::deftex; |
|
if (ref($settings) eq 'HASH') { |
|
if ($settings->{'texengine'}) { |
|
if ($settings->{'texengine'} =~ /^(MathJax|mimetex|tth)$/) { |
|
$deftex = $settings->{'texengine'}; |
|
} |
|
} |
|
} |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
my $mathdisp = '<tr'.$css_class.'><td style="vertical-align: top">'. |
|
'<span class="LC_nobreak">'.$choices{'texengine'}. |
|
'</span></td><td class="LC_right_item">'. |
|
'<select name="texengine">'."\n"; |
|
my %texoptions = ( |
|
MathJax => 'MathJax', |
|
mimetex => &mt('Convert to Images'), |
|
tth => &mt('TeX to HTML'), |
|
); |
|
foreach my $renderer ('MathJax','mimetex','tth') { |
|
my $selected = ''; |
|
if ($renderer eq $deftex) { |
|
$selected = ' selected="selected"'; |
|
} |
|
$mathdisp .= '<option value="'.$renderer.'"'.$selected.'>'.$texoptions{$renderer}.'</option>'."\n"; |
|
} |
|
$mathdisp .= '</select></td></tr>'."\n"; |
|
$itemcount ++; |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
\%choices,$itemcount); |
\%choices,$itemcount); |
|
$datatable = $mathdisp.$datatable; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= |
|
'<tr'.$css_class.'><td valign="top">'. |
|
'<span class="LC_nobreak">'.$choices{'canclone'}. |
|
'</span></td><td class="LC_left_item">'; |
|
my $currcanclone = 'none'; |
|
my $onclick; |
|
my @cloneoptions = ('none','domain'); |
|
my %clonetitles = &Apache::lonlocal::texthash ( |
|
none => 'No additional course requesters', |
|
domain => "Any course requester in course's domain", |
|
instcode => 'Course requests for official courses ...', |
|
); |
|
my (%codedefaults,@code_order,@posscodes); |
|
if (&Apache::lonnet::auto_instcode_defaults($dom,\%codedefaults, |
|
\@code_order) eq 'ok') { |
|
if (@code_order > 0) { |
|
push(@cloneoptions,'instcode'); |
|
$onclick = ' onclick="toggleDisplay(this.form,'."'cloneinstcode'".');"'; |
|
} |
|
} |
|
if (ref($settings) eq 'HASH') { |
|
if ($settings->{'canclone'}) { |
|
if (ref($settings->{'canclone'}) eq 'HASH') { |
|
if (ref($settings->{'canclone'}{'instcode'}) eq 'ARRAY') { |
|
if (@code_order > 0) { |
|
$currcanclone = 'instcode'; |
|
@posscodes = @{$settings->{'canclone'}{'instcode'}}; |
|
} |
|
} |
|
} elsif ($settings->{'canclone'} eq 'domain') { |
|
$currcanclone = $settings->{'canclone'}; |
|
} |
|
} |
|
} |
|
foreach my $option (@cloneoptions) { |
|
my ($checked,$additional); |
|
if ($currcanclone eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
|
if ($option eq 'instcode') { |
|
if (@code_order) { |
|
my $show = 'none'; |
|
if ($checked) { |
|
$show = 'block'; |
|
} |
|
$additional = '<div id="cloneinstcode" style="display:'.$show.'" />'. |
|
&mt('Institutional codes for new and cloned course have identical:'). |
|
'<br />'; |
|
foreach my $item (@code_order) { |
|
my $codechk; |
|
if ($checked) { |
|
if (grep(/^\Q$item\E$/,@posscodes)) { |
|
$codechk = ' checked="checked"'; |
|
} |
|
} |
|
$additional .= '<label>'. |
|
'<input type="checkbox" name="clonecode" value="'.$item.'"'.$codechk.' />'. |
|
$item.'</label>'; |
|
} |
|
$additional .= (' 'x2).'('.&mt('check as many as needed').')</div>'; |
|
} |
|
} |
|
$datatable .= |
|
'<span class="LC_nobreak"><label><input type="radio" name="canclone"'.$checked. |
|
' value="'.$option.'"'.$onclick.' />'.$clonetitles{$option}. |
|
'</label> '.$additional.'</span><br />'; |
|
} |
|
$datatable .= '</td>'. |
|
'</tr>'; |
|
$itemcount ++; |
} else { |
} else { |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
my ($currdefresponder,$def_official_credits,$def_unofficial_credits,$def_textbook_credits, |
my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql); |
%curruploadquota); |
|
my $currusecredits = 0; |
my $currusecredits = 0; |
|
my $postsubmitclient = 1; |
my @types = ('official','unofficial','community','textbook'); |
my @types = ('official','unofficial','community','textbook'); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
$currdefresponder = $settings->{'anonsurvey_threshold'}; |
$currdefresponder = $settings->{'anonsurvey_threshold'}; |
Line 2766 sub print_coursedefaults {
|
Line 4660 sub print_coursedefaults {
|
} |
} |
} |
} |
if (ref($settings->{'coursecredits'}) eq 'HASH') { |
if (ref($settings->{'coursecredits'}) eq 'HASH') { |
$def_official_credits = $settings->{'coursecredits'}->{'official'}; |
foreach my $type (@types) { |
$def_unofficial_credits = $settings->{'coursecredits'}->{'unofficial'}; |
next if ($type eq 'community'); |
$def_textbook_credits = $settings->{'coursecredits'}->{'textbook'}; |
$defcredits{$type} = $settings->{'coursecredits'}->{$type}; |
if (($def_official_credits ne '') || ($def_unofficial_credits ne '') || |
if ($defcredits{$type} ne '') { |
($def_textbook_credits ne '')) { |
$currusecredits = 1; |
$currusecredits = 1; |
} |
|
} |
|
} |
|
if (ref($settings->{'postsubmit'}) eq 'HASH') { |
|
if ($settings->{'postsubmit'}->{'client'} eq 'off') { |
|
$postsubmitclient = 0; |
|
foreach my $type (@types) { |
|
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
|
} |
|
} else { |
|
foreach my $type (@types) { |
|
if (ref($settings->{'postsubmit'}->{'timeout'}) eq 'HASH') { |
|
if ($settings->{'postsubmit'}->{'timeout'}->{$type} =~ /^\d+$/) { |
|
$deftimeout{$type} = $settings->{'postsubmit'}->{'timeout'}->{$type}; |
|
} else { |
|
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
|
} |
|
} else { |
|
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
|
} |
|
} |
|
} |
|
} else { |
|
foreach my $type (@types) { |
|
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
} |
} |
} |
} |
|
if (ref($settings->{'mysqltables'}) eq 'HASH') { |
|
foreach my $type (keys(%{$settings->{'mysqltables'}})) { |
|
$currmysql{$type} = $settings->{'mysqltables'}{$type}; |
|
} |
|
} else { |
|
foreach my $type (@types) { |
|
$currmysql{$type} = $staticdefaults{'mysqltables'}; |
|
} |
|
} |
|
} else { |
|
foreach my $type (@types) { |
|
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
|
} |
} |
} |
if (!$currdefresponder) { |
if (!$currdefresponder) { |
$currdefresponder = $staticdefaults{'anonsurvey_threshold'}; |
$currdefresponder = $staticdefaults{'anonsurvey_threshold'}; |
Line 2813 sub print_coursedefaults {
|
Line 4744 sub print_coursedefaults {
|
$display = 'block'; |
$display = 'block'; |
} |
} |
my $additional = '<div id="credits" style="display: '.$display.'">'. |
my $additional = '<div id="credits" style="display: '.$display.'">'. |
'<span class="LC_nobreak">'. |
'<i>'.&mt('Default credits').'</i><br /><table><tr>'; |
&mt('Default credits for official courses [_1]', |
foreach my $type (@types) { |
'<input type="text" name="official_credits" value="'. |
next if ($type eq 'community'); |
$def_official_credits.'" size="3" />'). |
$additional .= '<td align="center">'.&mt($type).'<br />'. |
'</span><br />'. |
'<input type="text" name="'.$type.'_credits"'. |
'<span class="LC_nobreak">'. |
' value="'.$defcredits{$type}.'" size="3" /></td>'; |
&mt('Default credits for unofficial courses [_1]', |
} |
'<input type="text" name="unofficial_credits" value="'. |
$additional .= '</tr></table></div>'."\n"; |
$def_unofficial_credits.'" size="3" />'). |
|
'</span><br />'. |
|
'<span class="LC_nobreak">'. |
|
&mt('Default credits for textbook courses [_1]', |
|
'<input type="text" name="textbook_credits" value="'. |
|
$def_textbook_credits.'" size="3" />'). |
|
'</span></div>'."\n"; |
|
%defaultchecked = ('coursecredits' => 'off'); |
%defaultchecked = ('coursecredits' => 'off'); |
@toggles = ('coursecredits'); |
@toggles = ('coursecredits'); |
my $current = { |
my $current = { |
Line 2835 sub print_coursedefaults {
|
Line 4759 sub print_coursedefaults {
|
}; |
}; |
(my $table,$itemcount) = |
(my $table,$itemcount) = |
&radiobutton_prefs($current,\@toggles,\%defaultchecked, |
&radiobutton_prefs($current,\@toggles,\%defaultchecked, |
\%choices,$itemcount,$onclick,$additional); |
\%choices,$itemcount,$onclick,$additional,'left'); |
$datatable .= $table; |
$datatable .= $table; |
|
$onclick = "toggleDisplay(this.form,'studentsubmission');"; |
|
my $display = 'none'; |
|
if ($postsubmitclient) { |
|
$display = 'block'; |
|
} |
|
$additional = '<div id="studentsubmission" style="display: '.$display.'">'. |
|
&mt('Number of seconds submit is disabled').'<br />'. |
|
'<i>'.&mt('Enter 0 to remain disabled until page reload.').'</i><br />'. |
|
'<table><tr>'; |
|
foreach my $type (@types) { |
|
$additional .= '<td align="center">'.&mt($type).'<br />'. |
|
'<input type="text" name="'.$type.'_timeout" value="'. |
|
$deftimeout{$type}.'" size="5" /></td>'; |
|
} |
|
$additional .= '</tr></table></div>'."\n"; |
|
%defaultchecked = ('postsubmit' => 'on'); |
|
@toggles = ('postsubmit'); |
|
$current = { |
|
'postsubmit' => $postsubmitclient, |
|
}; |
|
($table,$itemcount) = |
|
&radiobutton_prefs($current,\@toggles,\%defaultchecked, |
|
\%choices,$itemcount,$onclick,$additional,'left'); |
|
$datatable .= $table; |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'. |
|
$choices{'mysqltables'}. |
|
'</span></td>'. |
|
'<td align="right" class="LC_right_item">'. |
|
'<table><tr>'; |
|
foreach my $type (@types) { |
|
$datatable .= '<td align="center">'.&mt($type).'<br />'. |
|
'<input type="text" name="mysqltables_'.$type.'"'. |
|
' value="'.$currmysql{$type}.'" size="8" /></td>'; |
|
} |
|
$datatable .= '</tr></table></td></tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
|
|
} |
} |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
return $datatable; |
return $datatable; |
Line 3031 sub print_validation_rows {
|
Line 4992 sub print_validation_rows {
|
'</label></span> '; |
'</label></span> '; |
} |
} |
} elsif ($item eq 'markup') { |
} elsif ($item eq 'markup') { |
$datatable .= '<textarea name="'.$caller.'_validation_markup" cols="50" rows="5" wrap="soft">'. |
$datatable .= '<textarea name="'.$caller.'_validation_markup" cols="50" rows="5">'. |
$currvalidation{$item}. |
$currvalidation{$item}. |
'</textarea>'; |
'</textarea>'; |
} |
} |
Line 3042 sub print_validation_rows {
|
Line 5003 sub print_validation_rows {
|
} |
} |
if ($caller eq 'requestcourses') { |
if ($caller eq 'requestcourses') { |
my %currhash; |
my %currhash; |
if (ref($settings->{'validation'}) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ($settings->{'validation'}{'dc'} ne '') { |
if (ref($settings->{'validation'}) eq 'HASH') { |
$currhash{$settings->{'validation'}{'dc'}} = 1; |
if ($settings->{'validation'}{'dc'} ne '') { |
|
$currhash{$settings->{'validation'}{'dc'}} = 1; |
|
} |
} |
} |
} |
} |
my $numinrow = 2; |
my $numinrow = 2; |
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
'validationdc',%currhash); |
'validationdc',%currhash); |
|
my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '<tr'.$css_class.'><td>'; |
if ($numdc > 1) { |
if ($numdc > 1) { |
$datatable .= '</td></tr><tr class="LC_odd_row"><td>'. |
$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)'); |
&mt('Course creation processed as: (choose Dom. Coord.)'). |
|
'</td><td class="LC_left_item">'.$dctable.'</td></tr>'; |
|
} else { |
} else { |
$datatable .= $dctable.'</td></tr>'; |
$datatable .= &mt('Course creation processed as: '); |
} |
} |
|
$datatable .= '</td><td class="LC_left_item">'.$dctable.'</td></tr>'; |
$itemcount ++; |
$itemcount ++; |
} |
} |
if (ref($rowtotal)) { |
if (ref($rowtotal)) { |
Line 3065 sub print_validation_rows {
|
Line 5029 sub print_validation_rows {
|
return $datatable; |
return $datatable; |
} |
} |
|
|
|
sub print_passwords { |
|
my ($position,$dom,$confname,$settings,$rowtotal) = @_; |
|
my ($datatable,$css_class); |
|
my $itemcount = 0; |
|
my %titles = &Apache::lonlocal::texthash ( |
|
captcha => '"Forgot Password" CAPTCHA validation', |
|
link => 'Reset link expiration (hours)', |
|
case => 'Case-sensitive usernames/e-mail', |
|
prelink => 'Information required (form 1)', |
|
postlink => 'Information required (form 2)', |
|
emailsrc => 'LON-CAPA e-mail address type(s)', |
|
customtext => 'Domain specific text (HTML)', |
|
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', |
|
permanent => 'Permanent e-mail address', |
|
critical => 'Critical notification address', |
|
notify => 'Notification address', |
|
min => 'Minimum password length', |
|
max => 'Maximum password length', |
|
chars => 'Required characters', |
|
numsaved => 'Number of previous passwords to save and disallow reuse', |
|
); |
|
if ($position eq 'top') { |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
my $shownlinklife = 2; |
|
my $prelink = 'both'; |
|
my (%casesens,%postlink,%emailsrc,$nostdtext,$customurl); |
|
if (ref($settings) eq 'HASH') { |
|
if ($settings->{resetlink} =~ /^\d+(|\.\d*)$/) { |
|
$shownlinklife = $settings->{resetlink}; |
|
} |
|
if (ref($settings->{resetcase}) eq 'ARRAY') { |
|
map { $casesens{$_} = 1; } (@{$settings->{resetcase}}); |
|
} |
|
if ($settings->{resetprelink} =~ /^(both|either)$/) { |
|
$prelink = $settings->{resetprelink}; |
|
} |
|
if (ref($settings->{resetpostlink}) eq 'HASH') { |
|
%postlink = %{$settings->{resetpostlink}}; |
|
} |
|
if (ref($settings->{resetemail}) eq 'ARRAY') { |
|
map { $emailsrc{$_} = 1; } (@{$settings->{resetemail}}); |
|
} |
|
if ($settings->{resetremove}) { |
|
$nostdtext = 1; |
|
} |
|
if ($settings->{resetcustom}) { |
|
$customurl = $settings->{resetcustom}; |
|
} |
|
} else { |
|
if (ref($types) eq 'ARRAY') { |
|
foreach my $item (@{$types}) { |
|
$casesens{$item} = 1; |
|
$postlink{$item} = ['username','email']; |
|
} |
|
} |
|
$casesens{'default'} = 1; |
|
$postlink{'default'} = ['username','email']; |
|
$prelink = 'both'; |
|
%emailsrc = ( |
|
permanent => 1, |
|
critical => 1, |
|
notify => 1, |
|
); |
|
} |
|
$datatable = &captcha_choice('passwords',$settings,$$rowtotal); |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'link'}.'</td>'. |
|
'<td class="LC_left_item">'. |
|
'<input type="textbox" value="'.$shownlinklife.'" '. |
|
'name="passwords_link" size="3" /></td></tr>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'case'}.'</td>'. |
|
'<td class="LC_left_item">'; |
|
if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) { |
|
foreach my $item (@{$types}) { |
|
my $checkedcase; |
|
if ($casesens{$item}) { |
|
$checkedcase = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="passwords_case_sensitive" value="'. |
|
$item.'"'.$checkedcase.' />'.$usertypes->{$item}.'</label>'. |
|
'</span> '; |
|
} |
|
} |
|
my $checkedcase; |
|
if ($casesens{'default'}) { |
|
$checkedcase = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label><input type="checkbox" '. |
|
'name="passwords_case_sensitive" value="default"'.$checkedcase.' />'. |
|
$othertitle.'</label></span></td>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
my %checkedpre = ( |
|
both => ' checked="checked"', |
|
either => '', |
|
); |
|
if ($prelink eq 'either') { |
|
$checkedpre{either} = ' checked="checked"'; |
|
$checkedpre{both} = ''; |
|
} |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'prelink'}.'</td>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="passwords_prelink" value="both"'.$checkedpre{'both'}.' />'. |
|
&mt('Both username and e-mail address').'</label></span> '. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="passwords_prelink" value="either"'.$checkedpre{'either'}.' />'. |
|
&mt('Either username or e-mail address').'</label></span></td></tr>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'postlink'}.'</td>'. |
|
'<td class="LC_left_item">'; |
|
my %postlinked; |
|
if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) { |
|
foreach my $item (@{$types}) { |
|
undef(%postlinked); |
|
$datatable .= '<fieldset style="display: inline-block;">'. |
|
'<legend>'.$usertypes->{$item}.'</legend>'; |
|
if (ref($postlink{$item}) eq 'ARRAY') { |
|
map { $postlinked{$_} = 1; } (@{$postlink{$item}}); |
|
} |
|
foreach my $field ('email','username') { |
|
my $checked; |
|
if ($postlinked{$field}) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="passwords_postlink_'.$item.'" value="'. |
|
$field.'"'.$checked.' />'.$field.'</label>'. |
|
'<span> '; |
|
} |
|
$datatable .= '</fieldset>'; |
|
} |
|
} |
|
if (ref($postlink{'default'}) eq 'ARRAY') { |
|
map { $postlinked{$_} = 1; } (@{$postlink{'default'}}); |
|
} |
|
$datatable .= '<fieldset style="display: inline-block;">'. |
|
'<legend>'.$othertitle.'</legend>'; |
|
foreach my $field ('email','username') { |
|
my $checked; |
|
if ($postlinked{$field}) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="passwords_postlink_default" value="'. |
|
$field.'"'.$checked.' />'.$field.'</label>'. |
|
'<span> '; |
|
} |
|
$datatable .= '</fieldset></td></tr>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'emailsrc'}.'</td>'. |
|
'<td class="LC_left_item">'; |
|
foreach my $type ('permanent','critical','notify') { |
|
my $checkedemail; |
|
if ($emailsrc{$type}) { |
|
$checkedemail = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="passwords_emailsrc" value="'. |
|
$type.'"'.$checkedemail.' />'.$titles{$type}.'</label>'. |
|
'<span> '; |
|
} |
|
$datatable .= '</td></tr>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
my $switchserver = &check_switchserver($dom,$confname); |
|
my ($showstd,$noshowstd); |
|
if ($nostdtext) { |
|
$noshowstd = ' checked="checked"'; |
|
} else { |
|
$showstd = ' checked="checked"'; |
|
} |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'customtext'}.'</td>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak">'. |
|
&mt('Retain standard text:'). |
|
'<label><input type="radio" name="passwords_stdtext" value="1"'.$showstd.' />'. |
|
&mt('Yes').'</label>'.' '. |
|
'<label><input type="radio" name="passwords_stdtext" value="0"'.$noshowstd.' />'. |
|
&mt('No').'</label></span><br />'. |
|
'<span class="LC_fontsize_small">'. |
|
&mt('(If you use the same account ... reset a password from this page.)').'</span><br /><br />'. |
|
&mt('Include custom text:'); |
|
if ($customurl) { |
|
my $link = &Apache::loncommon::modal_link($customurl,&mt('custom text'),600,500, |
|
undef,undef,undef,undef,'background-color:#ffffff'); |
|
$datatable .= '<span class="LC_nobreak"> '.$link. |
|
'<label><input type="checkbox" name="passwords_custom_del"'. |
|
' value="1" />'.&mt('Delete?').'</label></span>'. |
|
' <span class="LC_nobreak"> '.&mt('Replace:').'</span>'; |
|
} |
|
if ($switchserver) { |
|
$datatable .= '<span class="LC_nobreak"> '.&mt('Upload to library server: [_1]',$switchserver).'</span>'; |
|
} else { |
|
$datatable .='<span class="LC_nobreak"> '. |
|
'<input type="file" name="passwords_customfile" /></span>'; |
|
} |
|
$datatable .= '</td></tr>'; |
|
} elsif ($position eq 'middle') { |
|
my %domconf = &Apache::lonnet::get_dom('configuration',['defaults'],$dom); |
|
my @items = ('intauth_cost','intauth_check','intauth_switch'); |
|
my %defaults; |
|
if (ref($domconf{'defaults'}) eq 'HASH') { |
|
%defaults = %{$domconf{'defaults'}}; |
|
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 ($itemcount%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 width="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>'; |
|
$itemcount ++; |
|
} |
|
} elsif ($position eq 'lower') { |
|
my ($min,$max,%chars,$numsaved); |
|
$min = $Apache::lonnet::passwdmin; |
|
if (ref($settings) eq 'HASH') { |
|
if ($settings->{min}) { |
|
$min = $settings->{min}; |
|
} |
|
if ($settings->{max}) { |
|
$max = $settings->{max}; |
|
} |
|
if (ref($settings->{chars}) eq 'ARRAY') { |
|
map { $chars{$_} = 1; } (@{$settings->{chars}}); |
|
} |
|
if ($settings->{numsaved}) { |
|
$numsaved = $settings->{numsaved}; |
|
} |
|
} |
|
my %rulenames = &Apache::lonlocal::texthash( |
|
uc => 'At least one upper case letter', |
|
lc => 'At least one lower case letter', |
|
num => 'At least one number', |
|
spec => 'At least one non-alphanumeric', |
|
); |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'min'}.'</td>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<input type="text" name="passwords_min" value="'.$min.'" size="3" '. |
|
'onblur="javascript:warnIntPass(this);" />'. |
|
'<span class="LC_fontsize_small"> '.&mt('(Enter an integer: 7 or larger)').'</span>'. |
|
'</span></td></tr>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'max'}.'</td>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<input type="text" name="passwords_max" value="'.$max.'" size="3" '. |
|
'onblur="javascript:warnIntPass(this);" />'. |
|
'<span class="LC_fontsize_small"> '.&mt('(Leave blank for no maximum)').'</span>'. |
|
'</span></td></tr>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'chars'}.'<br />'. |
|
'<span class="LC_nobreak LC_fontsize_small">'.&mt('(Leave unchecked if not required)'). |
|
'</span></td>'; |
|
my $numinrow = 2; |
|
my @possrules = ('uc','lc','num','spec'); |
|
$datatable .= '<td class="LC_left_item"><table>'; |
|
for (my $i=0; $i<@possrules; $i++) { |
|
my ($rem,$checked); |
|
if ($chars{$possrules[$i]}) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
} |
|
$datatable .= '<td><span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="passwords_chars" value="'.$possrules[$i].'"'.$checked.' />'. |
|
$rulenames{$possrules[$i]}.'</label></span></td>'; |
|
} |
|
my $rem = @possrules%($numinrow); |
|
my $colsleft = $numinrow - $rem; |
|
if ($colsleft > 1 ) { |
|
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
|
' </td>'; |
|
} elsif ($colsleft == 1) { |
|
$datatable .= '<td class="LC_left_item"> </td>'; |
|
} |
|
$datatable .='</table></td></tr>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'numsaved'}.'</td>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<input type="text" name="passwords_numsaved" value="'.$numsaved.'" size="3" '. |
|
'onblur="javascript:warnIntPass(this);" />'. |
|
'<span class="LC_fontsize_small"> '.&mt('(Leave blank to not save previous passwords)').'</span>'. |
|
'</span></td></tr>'; |
|
} else { |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
my %ownerchg = ( |
|
by => {}, |
|
for => {}, |
|
); |
|
my %ownertitles = &Apache::lonlocal::texthash ( |
|
by => 'Course owner status(es) allowed', |
|
for => 'Student status(es) allowed', |
|
); |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{crsownerchg}) eq 'HASH') { |
|
if (ref($settings->{crsownerchg}{'by'}) eq 'ARRAY') { |
|
map { $ownerchg{by}{$_} = 1; } (@{$settings->{crsownerchg}{'by'}}); |
|
} |
|
if (ref($settings->{crsownerchg}{'for'}) eq 'ARRAY') { |
|
map { $ownerchg{for}{$_} = 1; } (@{$settings->{crsownerchg}{'for'}}); |
|
} |
|
} |
|
} |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr '.$css_class.'>'. |
|
'<td>'. |
|
&mt('Requirements').'<ul>'. |
|
'<li>'.&mt("Course 'type' is not a Community").'</li>'. |
|
'<li>'.&mt('User is Course Coordinator and also course owner').'</li>'. |
|
'<li>'.&mt("Student's only active roles are student role(s) in course(s) owned by this user").'</li>'. |
|
'<li>'.&mt('User, course, and student share same domain').'</li>'. |
|
'</ul>'. |
|
'</td>'. |
|
'<td class="LC_left_item">'; |
|
foreach my $item ('by','for') { |
|
$datatable .= '<fieldset style="display: inline-block;">'. |
|
'<legend>'.$ownertitles{$item}.'</legend>'; |
|
if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) { |
|
foreach my $type (@{$types}) { |
|
my $checked; |
|
if ($ownerchg{$item}{$type}) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="passwords_crsowner_'.$item.'" value="'. |
|
$type.'"'.$checked.' />'.$usertypes->{$type}.'</label>'. |
|
'</span> '; |
|
} |
|
} |
|
my $checked; |
|
if ($ownerchg{$item}{'default'}) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label><input type="checkbox" '. |
|
'name="passwords_crsowner_'.$item.'" value="default"'.$checked.' />'. |
|
$othertitle.'</label></span></fieldset>'; |
|
} |
|
$datatable .= '</td></tr>'; |
|
} |
|
return $datatable; |
|
} |
|
|
|
sub print_wafproxy { |
|
my ($position,$dom,$settings,$rowtotal) = @_; |
|
my $css_class; |
|
my $itemcount = 0; |
|
my $datatable; |
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
|
my (%othercontrol,%otherdoms,%aliases,%saml,%values,$setdom,$showdom); |
|
my %lt = &wafproxy_titles(); |
|
foreach my $server (sort(keys(%servers))) { |
|
my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server}); |
|
next if ($serverhome eq ''); |
|
my $serverdom; |
|
if ($serverhome ne $server) { |
|
$serverdom = &Apache::lonnet::host_domain($serverhome); |
|
if (($serverdom ne '') && (&Apache::lonnet::domain($serverdom) ne '')) { |
|
$othercontrol{$server} = $serverdom; |
|
} |
|
} else { |
|
$serverdom = &Apache::lonnet::host_domain($server); |
|
next if (($serverdom eq '') || (&Apache::lonnet::domain($serverdom) eq '')); |
|
if ($serverdom ne $dom) { |
|
$othercontrol{$server} = $serverdom; |
|
} else { |
|
$setdom = 1; |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{'alias'}) eq 'HASH') { |
|
$aliases{$dom} = $settings->{'alias'}; |
|
if ($aliases{$dom} ne '') { |
|
$showdom = 1; |
|
} |
|
} |
|
if (ref($settings->{'saml'}) eq 'HASH') { |
|
$saml{$dom} = $settings->{'saml'}; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
if ($setdom) { |
|
%{$values{$dom}} = (); |
|
if (ref($settings) eq 'HASH') { |
|
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') { |
|
$values{$dom}{$item} = $settings->{$item}; |
|
} |
|
} |
|
} |
|
if (keys(%othercontrol)) { |
|
%otherdoms = reverse(%othercontrol); |
|
foreach my $domain (keys(%otherdoms)) { |
|
%{$values{$domain}} = (); |
|
my %config = &Apache::lonnet::get_dom('configuration',['wafproxy'],$domain); |
|
if (ref($config{'wafproxy'}) eq 'HASH') { |
|
$aliases{$domain} = $config{'wafproxy'}{'alias'}; |
|
if (exists($config{'wafproxy'}{'saml'})) { |
|
$saml{$domain} = $config{'wafproxy'}{'saml'}; |
|
} |
|
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') { |
|
$values{$domain}{$item} = $config{'wafproxy'}{$item}; |
|
} |
|
} |
|
} |
|
} |
|
if ($position eq 'top') { |
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
|
my %aliasinfo; |
|
foreach my $server (sort(keys(%servers))) { |
|
$itemcount ++; |
|
my $dom_in_effect; |
|
my $aliasrows = '<tr>'. |
|
'<td class="LC_left_item" style="vertical-align: baseline;">'. |
|
&mt('Hostname').': '. |
|
'<i>'.&Apache::lonnet::hostname($server).'</i></td><td> </td>'; |
|
if ($othercontrol{$server}) { |
|
$dom_in_effect = $othercontrol{$server}; |
|
my ($current,$forsaml); |
|
if (ref($aliases{$dom_in_effect}) eq 'HASH') { |
|
$current = $aliases{$dom_in_effect}{$server}; |
|
} |
|
if (ref($saml{$dom_in_effect}) eq 'HASH') { |
|
if ($saml{$dom_in_effect}{$server}) { |
|
$forsaml = 1; |
|
} |
|
} |
|
$aliasrows .= '<td class="LC_left_item" style="vertical-align: baseline;">'. |
|
&mt('Alias').': '; |
|
if ($current) { |
|
$aliasrows .= $current; |
|
if ($forsaml) { |
|
$aliasrows .= ' ('.&mt('also for SSO Auth').')'; |
|
} |
|
} else { |
|
$aliasrows .= &mt('None'); |
|
} |
|
$aliasrows .= ' <span class="LC_small">('. |
|
&mt('controlled by domain: [_1]', |
|
'<b>'.$dom_in_effect.'</b>').')</span></td>'; |
|
} else { |
|
$dom_in_effect = $dom; |
|
my ($current,$samlon,$samloff); |
|
$samloff = ' checked="checked"'; |
|
if (ref($aliases{$dom}) eq 'HASH') { |
|
if ($aliases{$dom}{$server}) { |
|
$current = $aliases{$dom}{$server}; |
|
} |
|
} |
|
if (ref($saml{$dom}) eq 'HASH') { |
|
if ($saml{$dom}{$server}) { |
|
$samlon = $samloff; |
|
undef($samloff); |
|
} |
|
} |
|
$aliasrows .= '<td class="LC_left_item" style="vertical-align: baseline;">'. |
|
&mt('Alias').': '. |
|
'<input type="text" name="wafproxy_alias_'.$server.'" '. |
|
'value="'.$current.'" size="30" />'. |
|
(' 'x2).'<span class="LC_nobreak">'. |
|
&mt('Alias used for SSO Auth').': <label>'. |
|
'<input type="radio" value="0"'.$samloff.' name="wafproxy_alias_saml_'.$server.'" />'. |
|
&mt('No').'</label> <label>'. |
|
'<input type="radio" value="1"'.$samlon.' name="wafproxy_alias_saml_'.$server.'" />'. |
|
&mt('Yes').'</label></span>'. |
|
'</td>'; |
|
} |
|
$aliasrows .= '</tr>'; |
|
$aliasinfo{$dom_in_effect} .= $aliasrows; |
|
} |
|
if ($aliasinfo{$dom}) { |
|
my ($onclick,$wafon,$wafoff,$showtable); |
|
$onclick = ' onclick="javascript:toggleWAF();"'; |
|
$wafoff = ' checked="checked"'; |
|
$showtable = ' style="display:none";'; |
|
if ($showdom) { |
|
$wafon = $wafoff; |
|
$wafoff = ''; |
|
$showtable = ' style="display:inline;"'; |
|
} |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable = '<tr'.$css_class.'>'. |
|
'<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$dom.'</b>').'<br />'. |
|
'<span class="LC_nobreak">'.&mt('WAF in use?').' <label>'. |
|
'<input type="radio" name="wafproxy_'.$dom.'" value="1"'.$wafon.$onclick.' />'. |
|
&mt('Yes').'</label>'.(' 'x2).'<label>'. |
|
'<input type="radio" name="wafproxy_'.$dom.'" value="0"'.$wafoff.$onclick.' />'. |
|
&mt('No').'</label></span></td>'. |
|
'<td class="LC_left_item">'. |
|
'<table id="wafproxy_table"'.$showtable.'>'.$aliasinfo{$dom}. |
|
'</table></td></tr>'; |
|
$itemcount++; |
|
} |
|
if (keys(%otherdoms)) { |
|
foreach my $key (sort(keys(%otherdoms))) { |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$key.'</b>').'</td>'. |
|
'<td class="LC_left_item"><table>'.$aliasinfo{$key}. |
|
'</table></td></tr>'; |
|
$itemcount++; |
|
} |
|
} |
|
} else { |
|
my %ip_methods = &remoteip_methods(); |
|
if ($setdom) { |
|
$itemcount ++; |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
my ($nowafstyle,$wafstyle,$curr_remotip,$currwafdisplay,$vpndircheck,$vpnaliascheck, |
|
$currwafvpn,$wafrangestyle,$alltossl,$ssltossl); |
|
$wafstyle = ' style="display:none;"'; |
|
$nowafstyle = ' style="display:table-row;"'; |
|
$currwafdisplay = ' style="display: none"'; |
|
$wafrangestyle = ' style="display: none"'; |
|
$curr_remotip = 'n'; |
|
$ssltossl = ' checked="checked"'; |
|
if ($showdom) { |
|
$wafstyle = ' style="display:table-row;"'; |
|
$nowafstyle = ' style="display:none;"'; |
|
if (keys(%{$values{$dom}})) { |
|
if ($values{$dom}{remoteip} =~ /^[nmh]$/) { |
|
$curr_remotip = $values{$dom}{remoteip}; |
|
} |
|
if ($curr_remotip eq 'h') { |
|
$currwafdisplay = ' style="display:table-row"'; |
|
$wafrangestyle = ' style="display:inline-block;"'; |
|
} |
|
if ($values{$dom}{'sslopt'}) { |
|
$alltossl = ' checked="checked"'; |
|
$ssltossl = ''; |
|
} |
|
} |
|
if (($values{$dom}{'vpnint'} ne '') || ($values{$dom}{'vpnext'} ne '')) { |
|
$vpndircheck = ' checked="checked"'; |
|
$currwafvpn = ' style="display:table-row;"'; |
|
$wafrangestyle = ' style="display:inline-block;"'; |
|
} else { |
|
$vpnaliascheck = ' checked="checked"'; |
|
$currwafvpn = ' style="display:none;"'; |
|
} |
|
} |
|
$datatable .= '<tr'.$css_class.' id="nowafproxyrow_'.$dom.'"'.$wafstyle.'>'. |
|
'<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$dom.'</b>').'</td>'. |
|
'<td class="LC_right_item">'.&mt('WAF not in use, nothing to set').'</td>'. |
|
'</tr>'. |
|
'<tr'.$css_class.' id="wafproxyrow_'.$dom.'"'.$wafstyle.'>'. |
|
'<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$dom.'</b>').'<br /><br />'. |
|
'<div id="wafproxyranges_'.$dom.'">'.&mt('Format for comma separated IP ranges').':<br />'. |
|
&mt('A.B.C.D/N or A.B.C.D-E.F.G.H').'<br />'. |
|
&mt('Range(s) stored in CIDR notation').'</div></td>'. |
|
'<td class="LC_left_item"><table>'. |
|
'<tr>'. |
|
'<td valign="top">'.$lt{'remoteip'}.': '. |
|
'<select name="wafproxy_remoteip" id="wafproxy_remoteip" onchange="javascript:updateWAF();">'; |
|
foreach my $option ('m','h','n') { |
|
my $sel; |
|
if ($option eq $curr_remotip) { |
|
$sel = ' selected="selected"'; |
|
} |
|
$datatable .= '<option value="'.$option.'"'.$sel.'>'. |
|
$ip_methods{$option}.'</option>'; |
|
} |
|
$datatable .= '</select></td></tr>'."\n". |
|
'<tr id="wafproxy_header"'.$currwafdisplay.'><td>'. |
|
$lt{'ipheader'}.': '. |
|
'<input type="text" value="'.$values{$dom}{'ipheader'}.'" '. |
|
'name="wafproxy_ipheader" />'. |
|
'</td></tr>'."\n". |
|
'<tr id="wafproxy_trust"'.$currwafdisplay.'><td>'. |
|
$lt{'trusted'}.':<br />'. |
|
'<textarea name="wafproxy_trusted" rows="3" cols="80">'. |
|
$values{$dom}{'trusted'}.'</textarea>'. |
|
'</td></tr>'."\n". |
|
'<tr><td><hr /></td></tr>'."\n". |
|
'<tr>'. |
|
'<td valign="top">'.$lt{'vpnaccess'}.':<br /><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="wafproxy_vpnaccess"'.$vpndircheck.' value="1" onclick="javascript:checkWAF();" />'. |
|
$lt{'vpndirect'}.'</label>'.(' 'x2). |
|
'<label><input type="radio" name="wafproxy_vpnaccess"'.$vpnaliascheck.' value="0" onclick="javascript:checkWAF();" />'. |
|
$lt{'vpnaliased'}.'</label></span></td></tr>'; |
|
foreach my $item ('vpnint','vpnext') { |
|
$datatable .= '<tr id="wafproxy_show_'.$item.'"'.$currwafvpn.'>'. |
|
'<td valign="top">'.$lt{$item}.':<br />'. |
|
'<textarea name="wafproxy_'.$item.'" rows="3" cols="80">'. |
|
$values{$dom}{$item}.'</textarea>'. |
|
'</td></tr>'."\n"; |
|
} |
|
$datatable .= '<tr><td><hr /></td></tr>'."\n". |
|
'<tr>'. |
|
'<td valign="top">'.$lt{'sslopt'}.':<br /><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="wafproxy_sslopt"'.$alltossl.' value="1" />'. |
|
$lt{'alltossl'}.'</label>'.(' 'x2). |
|
'<label><input type="radio" name="wafproxy_sslopt"'.$ssltossl.' value="0" />'. |
|
$lt{'ssltossl'}.'</label></span></td></tr>'."\n". |
|
'</table></td></tr>'; |
|
} |
|
if (keys(%otherdoms)) { |
|
foreach my $domain (sort(keys(%otherdoms))) { |
|
$itemcount ++; |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$domain.'</b>').'</td>'. |
|
'<td class="LC_left_item"><table>'; |
|
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
|
my $showval = &mt('None'); |
|
if ($item eq 'ssl') { |
|
$showval = $lt{'ssltossl'}; |
|
} |
|
if ($values{$domain}{$item}) { |
|
$showval = $values{$domain}{$item}; |
|
if ($item eq 'ssl') { |
|
$showval = $lt{'alltossl'}; |
|
} elsif ($item eq 'remoteip') { |
|
$showval = $ip_methods{$values{$domain}{$item}}; |
|
} |
|
} |
|
$datatable .= '<tr>'. |
|
'<td>'.$lt{$item}.': '.$showval.'</td></tr>'; |
|
} |
|
$datatable .= '</table></td></tr>'; |
|
} |
|
} |
|
} |
|
$$rowtotal += $itemcount; |
|
return $datatable; |
|
} |
|
|
|
sub wafproxy_titles { |
|
return &Apache::lonlocal::texthash( |
|
remoteip => "Method for determining user's IP", |
|
ipheader => 'Request header containing remote IP', |
|
trusted => 'Trusted IP range(s)', |
|
vpnaccess => 'Access from institutional VPN', |
|
vpndirect => 'via regular hostname (no WAF)', |
|
vpnaliased => 'via aliased hostname (WAF)', |
|
vpnint => 'Internal IP Range(s) for VPN sessions', |
|
vpnext => 'IP Range(s) for backend WAF connections', |
|
sslopt => 'Forwarding http/https', |
|
alltossl => 'WAF forwards both http and https requests to https', |
|
ssltossl => 'WAF forwards http requests to http and https to https', |
|
); |
|
} |
|
|
|
sub remoteip_methods { |
|
return &Apache::lonlocal::texthash( |
|
m => 'Use Apache mod_remoteip', |
|
h => 'Use headers parsed by LON-CAPA', |
|
n => 'Not in use', |
|
); |
|
} |
|
|
sub print_usersessions { |
sub print_usersessions { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($css_class,$datatable,%checked,%choices); |
my ($css_class,$datatable,%checked,%choices); |
Line 3079 sub print_usersessions {
|
Line 5772 sub print_usersessions {
|
if ($position eq 'top') { |
if ($position eq 'top') { |
if (keys(%serverhomes) > 1) { |
if (keys(%serverhomes) > 1) { |
my %spareid = ¤t_offloads_to($dom,$settings,\%servers); |
my %spareid = ¤t_offloads_to($dom,$settings,\%servers); |
$datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$rowtotal); |
my ($curroffloadnow,$curroffloadoth); |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{'offloadnow'}) eq 'HASH') { |
|
$curroffloadnow = $settings->{'offloadnow'}; |
|
} |
|
if (ref($settings->{'offloadoth'}) eq 'HASH') { |
|
$curroffloadoth = $settings->{'offloadoth'}; |
|
} |
|
} |
|
my $other_insts = scalar(keys(%by_location)); |
|
$datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids, |
|
$other_insts,$curroffloadnow,$curroffloadoth,$rowtotal); |
} else { |
} else { |
$datatable .= '<tr'.$css_class.'><td colspan="2">'. |
$datatable .= '<tr'.$css_class.'><td colspan="2">'. |
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.'); |
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.'); |
Line 3329 sub current_offloads_to {
|
Line 6033 sub current_offloads_to {
|
} |
} |
|
|
sub spares_row { |
sub spares_row { |
my ($dom,$servers,$spareid,$serverhomes,$altids,$rowtotal) = @_; |
my ($dom,$servers,$spareid,$serverhomes,$altids,$other_insts, |
|
$curroffloadnow,$curroffloadoth,$rowtotal) = @_; |
my $css_class; |
my $css_class; |
my $numinrow = 4; |
my $numinrow = 4; |
my $itemcount = 1; |
my $itemcount = 1; |
Line 3349 sub spares_row {
|
Line 6054 sub spares_row {
|
} |
} |
} |
} |
next unless (ref($spareid->{$server}) eq 'HASH'); |
next unless (ref($spareid->{$server}) eq 'HASH'); |
|
my ($checkednow,$checkedoth); |
|
if (ref($curroffloadnow) eq 'HASH') { |
|
if ($curroffloadnow->{$server}) { |
|
$checkednow = ' checked="checked"'; |
|
} |
|
} |
|
if (ref($curroffloadoth) eq 'HASH') { |
|
if ($curroffloadoth->{$server}) { |
|
$checkedoth = ' checked="checked"'; |
|
} |
|
} |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$datatable .= '<tr'.$css_class.'> |
$datatable .= '<tr'.$css_class.'> |
<td rowspan="2"> |
<td rowspan="2"> |
<span class="LC_nobreak">'. |
<span class="LC_nobreak">'. |
&mt('[_1] when busy, offloads to:' |
&mt('[_1] when busy, offloads to:' |
,'<b>'.$server.'</b>'). |
,'<b>'.$server.'</b>').'</span><br />'. |
|
'<span class="LC_nobreak">'."\n". |
|
'<label><input type="checkbox" name="offloadnow" value="'.$server.'"'.$checkednow.' />'. |
|
' '.&mt('Switch any active user on next access').'</label></span>'. |
|
"\n"; |
|
if ($other_insts) { |
|
$datatable .= '<br />'. |
|
'<span class="LC_nobreak">'."\n". |
|
'<label><input type="checkbox" name="offloadoth" value="'.$server.'"'.$checkedoth.' />'. |
|
' '.&mt('Switch other institutions on next access').'</label></span>'. |
"\n"; |
"\n"; |
|
} |
my (%current,%canselect); |
my (%current,%canselect); |
my @choices = |
my @choices = |
&possible_newspares($server,$spareid->{$server},$serverhomes,$altids); |
&possible_newspares($server,$spareid->{$server},$serverhomes,$altids); |
Line 3479 sub print_loadbalancing {
|
Line 6205 sub print_loadbalancing {
|
my $numinrow = 1; |
my $numinrow = 1; |
my $datatable; |
my $datatable; |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my (%currbalancer,%currtargets,%currrules,%existing); |
my (%currbalancer,%currtargets,%currrules,%existing,%currcookies); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
%existing = %{$settings}; |
%existing = %{$settings}; |
} |
} |
if ((keys(%servers) > 1) || (keys(%existing) > 0)) { |
if ((keys(%servers) > 1) || (keys(%existing) > 0)) { |
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer, |
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer, |
\%currtargets,\%currrules); |
\%currtargets,\%currrules,\%currcookies); |
} else { |
} else { |
return; |
return; |
} |
} |
Line 3559 sub print_loadbalancing {
|
Line 6285 sub print_loadbalancing {
|
my ($numspares,@spares) = &count_servers($lonhost,%servers); |
my ($numspares,@spares) = &count_servers($lonhost,%servers); |
my @sparestypes = ('primary','default'); |
my @sparestypes = ('primary','default'); |
my %typetitles = &sparestype_titles(); |
my %typetitles = &sparestype_titles(); |
|
my %hostherechecked = ( |
|
no => ' checked="checked"', |
|
); |
|
my %balcookiechecked = ( |
|
no => ' checked="checked"', |
|
); |
foreach my $sparetype (@sparestypes) { |
foreach my $sparetype (@sparestypes) { |
my $targettable; |
my $targettable; |
for (my $i=0; $i<$numspares; $i++) { |
for (my $i=0; $i<$numspares; $i++) { |
Line 3578 sub print_loadbalancing {
|
Line 6310 sub print_loadbalancing {
|
$disabled = ' disabled="disabled"'; |
$disabled = ' disabled="disabled"'; |
} |
} |
$targettable .= |
$targettable .= |
'<td><label><input type="checkbox" name="loadbalancing_target_'.$balnum.'_'.$sparetype.'"'. |
'<td><span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="loadbalancing_target_'.$balnum.'_'.$sparetype.'"'. |
$checked.$disabled.' value="'.$chkboxval.'" id="loadbalancing_target_'.$balnum.'_'.$sparetype.'_'.$i.'" onclick="checkOffloads('."this,'$balnum','$sparetype'".');" /><span id="loadbalancing_targettxt_'.$balnum.'_'.$sparetype.'_'.$i.'"> '.$chkboxval. |
$checked.$disabled.' value="'.$chkboxval.'" id="loadbalancing_target_'.$balnum.'_'.$sparetype.'_'.$i.'" onclick="checkOffloads('."this,'$balnum','$sparetype'".');" /><span id="loadbalancing_targettxt_'.$balnum.'_'.$sparetype.'_'.$i.'"> '.$chkboxval. |
'</span></label></td>'; |
'</span></label></span></td>'; |
my $rem = $i%($numinrow); |
my $rem = $i%($numinrow); |
if ($rem == 0) { |
if ($rem == 0) { |
if (($i > 0) && ($i < $numspares-1)) { |
if (($i > 0) && ($i < $numspares-1)) { |
Line 3603 sub print_loadbalancing {
|
Line 6336 sub print_loadbalancing {
|
$datatable .= '<i>'.$typetitles{$sparetype}.'</i><br />'. |
$datatable .= '<i>'.$typetitles{$sparetype}.'</i><br />'. |
'<table><tr>'.$targettable.'</tr></table><br />'; |
'<table><tr>'.$targettable.'</tr></table><br />'; |
} |
} |
|
$hostherechecked{$sparetype} = ''; |
|
if (ref($currtargets{$lonhost}) eq 'HASH') { |
|
if (ref($currtargets{$lonhost}{$sparetype}) eq 'ARRAY') { |
|
if (grep(/^\Q$lonhost\E$/,@{$currtargets{$lonhost}{$sparetype}})) { |
|
$hostherechecked{$sparetype} = ' checked="checked"'; |
|
$hostherechecked{'no'} = ''; |
|
} |
|
} |
|
} |
|
} |
|
if ($currcookies{$lonhost}) { |
|
%balcookiechecked = ( |
|
yes => ' checked="checked"', |
|
); |
} |
} |
$datatable .= '</div></td></tr>'. |
$datatable .= &mt('Hosting on balancer itself').'<br />'. |
|
'<label><input type="radio" name="loadbalancing_target_'.$balnum.'_hosthere" value="no"'. |
|
$hostherechecked{'no'}.' />'.&mt('No').'</label><br />'; |
|
foreach my $sparetype (@sparestypes) { |
|
$datatable .= '<label><input type="radio" name="loadbalancing_target_'.$balnum.'_hosthere" '. |
|
'value="'.$sparetype.'"'.$hostherechecked{$sparetype}.' /><i>'.$typetitles{$sparetype}. |
|
'</i></label><br />'; |
|
} |
|
$datatable .= &mt('Use balancer cookie').'<br />'. |
|
'<label><input type="radio" name="loadbalancing_cookie_'.$balnum.'" value="1"'. |
|
$balcookiechecked{'yes'}.' />'.&mt('Yes').'</label><br />'. |
|
'<label><input type="radio" name="loadbalancing_cookie_'.$balnum.'" value="0"'. |
|
$balcookiechecked{'no'}.' />'.&mt('No').'</label><br />'. |
|
'</div></td></tr>'. |
&loadbalancing_rules($dom,$intdom,$currrules{$lonhost}, |
&loadbalancing_rules($dom,$intdom,$currrules{$lonhost}, |
$othertitle,$usertypes,$types,\%servers, |
$othertitle,$usertypes,$types,\%servers, |
\%currbalancer,$lonhost, |
\%currbalancer,$lonhost, |
Line 3618 sub print_loadbalancing {
|
Line 6378 sub print_loadbalancing {
|
} |
} |
|
|
sub get_loadbalancers_config { |
sub get_loadbalancers_config { |
my ($servers,$existing,$currbalancer,$currtargets,$currrules) = @_; |
my ($servers,$existing,$currbalancer,$currtargets,$currrules,$currcookies) = @_; |
return unless ((ref($servers) eq 'HASH') && |
return unless ((ref($servers) eq 'HASH') && |
(ref($existing) eq 'HASH') && (ref($currbalancer) eq 'HASH') && |
(ref($existing) eq 'HASH') && (ref($currbalancer) eq 'HASH') && |
(ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH')); |
(ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH') && |
|
(ref($currcookies) eq 'HASH')); |
if (keys(%{$existing}) > 0) { |
if (keys(%{$existing}) > 0) { |
my $oldlonhost; |
my $oldlonhost; |
foreach my $key (sort(keys(%{$existing}))) { |
foreach my $key (sort(keys(%{$existing}))) { |
Line 3640 sub get_loadbalancers_config {
|
Line 6401 sub get_loadbalancers_config {
|
$currbalancer->{$key} = 1; |
$currbalancer->{$key} = 1; |
$currtargets->{$key} = $existing->{$key}{'targets'}; |
$currtargets->{$key} = $existing->{$key}{'targets'}; |
$currrules->{$key} = $existing->{$key}{'rules'}; |
$currrules->{$key} = $existing->{$key}{'rules'}; |
|
if ($existing->{$key}{'cookie'}) { |
|
$currcookies->{$key} = 1; |
|
} |
} |
} |
} |
} |
} else { |
} else { |
Line 3670 sub loadbalancing_rules {
|
Line 6434 sub loadbalancing_rules {
|
if (ref($currrules) eq 'HASH') { |
if (ref($currrules) eq 'HASH') { |
$current = $currrules->{$type}; |
$current = $currrules->{$type}; |
} |
} |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) { |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) { |
if ($dom ne &Apache::lonnet::host_domain($lonhost)) { |
if ($dom ne &Apache::lonnet::host_domain($lonhost)) { |
$current = ''; |
$current = ''; |
} |
} |
Line 3695 sub loadbalancing_titles {
|
Line 6459 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 3722 sub loadbalance_rule_row {
|
Line 6491 sub loadbalance_rule_row {
|
my @rulenames; |
my @rulenames; |
my %ruletitles = &offloadtype_text(); |
my %ruletitles = &offloadtype_text(); |
if (($type eq '_LC_ipchangesso') || ($type eq '_LC_ipchange')) { |
if (($type eq '_LC_ipchangesso') || ($type eq '_LC_ipchange')) { |
@rulenames = ('balancer','offloadedto'); |
@rulenames = ('balancer','offloadedto','specific'); |
} else { |
} else { |
@rulenames = ('default','homeserver'); |
@rulenames = ('default','homeserver'); |
if ($type eq '_LC_external') { |
if ($type eq '_LC_external') { |
Line 3733 sub loadbalance_rule_row {
|
Line 6502 sub loadbalance_rule_row {
|
push(@rulenames,'none'); |
push(@rulenames,'none'); |
} |
} |
my $style = $targets_div_style; |
my $style = $targets_div_style; |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) { |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) { |
$style = $homedom_div_style; |
$style = $homedom_div_style; |
} |
} |
my $space; |
my $space; |
Line 3784 sub loadbalance_rule_row {
|
Line 6553 sub loadbalance_rule_row {
|
'<input type="radio" name="loadbalancing_rules_'.$balnum.'_'.$type. |
'<input type="radio" name="loadbalancing_rules_'.$balnum.'_'.$type. |
'" id="loadbalancing_rules_'.$balnum.'_'.$type.'_'.$i.'" value="'. |
'" id="loadbalancing_rules_'.$balnum.'_'.$type.'_'.$i.'" value="'. |
$rule.'" onclick="balanceruleChange('."this.form,'$balnum','$type'". |
$rule.'" onclick="balanceruleChange('."this.form,'$balnum','$type'". |
')"'.$checked.' /> '.$ruletitles{$rulenames[$i]}. |
')"'.$checked.' /> '; |
'</label>'.$extra.'</span><br />'."\n"; |
if (($rulenames[$i] eq 'specific') && ($type =~ /^_LC_ipchange/)) { |
|
$output .= $ruletitles{'particular'}; |
|
} else { |
|
$output .= $ruletitles{$rulenames[$i]}; |
|
} |
|
$output .= '</label>'.$extra.'</span><br />'."\n"; |
} |
} |
$output .= '</div></td></tr>'."\n"; |
$output .= '</div></td></tr>'."\n"; |
return $output; |
return $output; |
Line 3800 sub offloadtype_text {
|
Line 6574 sub offloadtype_text {
|
'none' => 'No offload', |
'none' => 'No offload', |
'balancer' => 'Session hosted on Load Balancer, after re-authentication', |
'balancer' => 'Session hosted on Load Balancer, after re-authentication', |
'offloadedto' => 'Session hosted on offload server, after re-authentication', |
'offloadedto' => 'Session hosted on offload server, after re-authentication', |
|
'particular' => 'Session hosted (after re-auth) on server:', |
); |
); |
return %ruletitles; |
return %ruletitles; |
} |
} |
Line 3814 sub sparestype_titles {
|
Line 6589 sub sparestype_titles {
|
|
|
sub contact_titles { |
sub contact_titles { |
my %titles = &Apache::lonlocal::texthash ( |
my %titles = &Apache::lonlocal::texthash ( |
'supportemail' => 'Support E-mail address', |
'supportemail' => 'Support E-mail address', |
'adminemail' => 'Default Server Admin E-mail address', |
'adminemail' => 'Default Server Admin E-mail address', |
'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 to be e-mailed to', |
'helpdeskmail' => "Helpdesk requests from all users in this domain", |
'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)', |
'otherdomsmail' => 'Helpdesk requests from users in other (unconfigured) domains', |
'requestsmail' => 'E-mail from course requests requiring approval', |
'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)', |
'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates', |
'requestsmail' => 'E-mail from course requests requiring approval', |
|
'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates', |
'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID', |
'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID', |
|
'hostipmail' => 'E-mail from nightly check of hostname/IP network changes', |
|
'errorthreshold' => 'Error count threshold for status e-mail to admin(s)', |
|
'errorsysmail' => 'Error count threshold for e-mail to developer group', |
|
'errorweights' => 'Weights used to compute error count', |
|
'errorexcluded' => 'Servers with unsent updates excluded from count', |
); |
); |
my %short_titles = &Apache::lonlocal::texthash ( |
my %short_titles = &Apache::lonlocal::texthash ( |
adminemail => 'Admin E-mail address', |
adminemail => 'Admin E-mail address', |
Line 3831 sub contact_titles {
|
Line 6612 sub contact_titles {
|
return (\%titles,\%short_titles); |
return (\%titles,\%short_titles); |
} |
} |
|
|
|
sub helpform_fields { |
|
my %titles = &Apache::lonlocal::texthash ( |
|
'username' => 'Name', |
|
'user' => 'Username/domain', |
|
'phone' => 'Phone', |
|
'cc' => 'Cc e-mail', |
|
'course' => 'Course Details', |
|
'section' => 'Sections', |
|
'screenshot' => 'File upload', |
|
); |
|
my @fields = ('username','phone','user','course','section','cc','screenshot'); |
|
my %possoptions = ( |
|
username => ['yes','no','req'], |
|
phone => ['yes','no','req'], |
|
user => ['yes','no'], |
|
cc => ['yes','no'], |
|
course => ['yes','no'], |
|
section => ['yes','no'], |
|
screenshot => ['yes','no'], |
|
); |
|
my %fieldoptions = &Apache::lonlocal::texthash ( |
|
'yes' => 'Optional', |
|
'req' => 'Required', |
|
'no' => "Not shown", |
|
); |
|
return (\@fields,\%titles,\%fieldoptions,\%possoptions); |
|
} |
|
|
sub tool_titles { |
sub tool_titles { |
my %titles = &Apache::lonlocal::texthash ( |
my %titles = &Apache::lonlocal::texthash ( |
aboutme => 'Personal web page', |
aboutme => 'Personal web page', |
Line 4015 sub print_usercreation {
|
Line 6824 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 4032 sub print_selfcreation {
|
Line 6842 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 4052 sub print_selfcreation {
|
Line 6872 sub print_selfcreation {
|
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked, |
\%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 ++; |
} |
} |
} |
} |
|
my @fields = ('lastname','firstname','middlename','permanentemail','id','inststatus'); |
|
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
|
$fieldtitles{'inststatus'} = &mt('Institutional status'); |
|
my $rem; |
|
my $numperrow = 2; |
|
my $css_class = $$rowtotal%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td class="LC_left_item">'.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').'</td>'. |
|
'<td class="LC_left_item">'."\n". |
|
'<table>'."\n"; |
|
for (my $i=0; $i<@fields; $i++) { |
|
$rem = $i%($numperrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
} |
|
my $currval; |
|
if (ref($createsettings) eq 'HASH') { |
|
if (ref($createsettings->{'shibenv'}) eq 'HASH') { |
|
$currval = $createsettings->{'shibenv'}{$fields[$i]}; |
|
} |
|
} |
|
$datatable .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak">'. |
|
'<input type="text" name="shibenv_'.$fields[$i].'" '. |
|
'value="'.$currval.'" size="10" /> '. |
|
$fieldtitles{$fields[$i]}.'</span></td>'; |
|
} |
|
my $colsleft = $numperrow - $rem; |
|
if ($colsleft > 1 ) { |
|
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
|
' </td>'; |
|
} elsif ($colsleft == 1) { |
|
$datatable .= '<td class="LC_left_item"> </td>'; |
|
} |
|
$datatable .= '</tr></table></td></tr>'; |
|
$$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); |
} |
|
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 ++; |
$$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'}, |
$additional .= '</tr></table>'; |
}; |
|
@ordered = @{$domdefaults{'inststatusguest'}}; |
} else { |
} else { |
$usertypes->{'default'} = &mt('All users'); |
$currassign = { selfassign => [] }; |
$additional .= &email_as_username($rowtotal,$processing); |
|
} |
} |
|
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 ++; |
|
} |
|
} |
|
} 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,$itemcount,$onclick,$additional); |
|
$$rowtotal += $itemcount; |
|
$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); |
my %lt = &captcha_phrases(); |
my %lt = &captcha_phrases(); |
$keyentry = 'hidden'; |
$keyentry = 'hidden'; |
|
my $colspan=2; |
if ($context eq 'cancreate') { |
if ($context eq 'cancreate') { |
$rowname = &mt('CAPTCHA validation'); |
$rowname = &mt('CAPTCHA validation'); |
} elsif ($context eq 'login') { |
} elsif ($context eq 'login') { |
$rowname = &mt('"Contact helpdesk" CAPTCHA validation'); |
$rowname = &mt('"Contact helpdesk" CAPTCHA validation'); |
|
} elsif ($context eq 'passwords') { |
|
$rowname = &mt('"Forgot Password" CAPTCHA validation'); |
|
$colspan=1; |
} |
} |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ($settings->{'captcha'}) { |
if ($settings->{'captcha'}) { |
Line 4219 sub captcha_choice {
|
Line 7357 sub captcha_choice {
|
$pubtext = $lt{'pub'}; |
$pubtext = $lt{'pub'}; |
$privtext = $lt{'priv'}; |
$privtext = $lt{'priv'}; |
$keyentry = 'text'; |
$keyentry = 'text'; |
|
$vertext = $lt{'ver'}; |
|
$currver = $settings->{'recaptchaversion'}; |
|
if ($currver ne '2') { |
|
$currver = 1; |
|
} |
} |
} |
if (ref($settings->{'recaptchakeys'}) eq 'HASH') { |
if (ref($settings->{'recaptchakeys'}) eq 'HASH') { |
$currpub = $settings->{'recaptchakeys'}{'public'}; |
$currpub = $settings->{'recaptchakeys'}{'public'}; |
Line 4227 sub captcha_choice {
|
Line 7370 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="'.$colspan.'">'."\n". |
'<table><tr><td>'."\n"; |
'<table><tr><td>'."\n"; |
foreach my $option ('original','recaptcha','notused') { |
foreach my $option ('original','recaptcha','notused') { |
$output .= '<span class="LC_nobreak"><label><input type="radio" name="'.$context.'_captcha" value="'. |
$output .= '<span class="LC_nobreak"><label><input type="radio" name="'.$context.'_captcha" value="'. |
Line 4246 sub captcha_choice {
|
Line 7402 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". |
'<span class="LC_nobreak"><span id="'.$context.'_recaptchaprivtxt">'.$privtext.'</span> '."\n". |
'<span class="LC_nobreak"><span id="'.$context.'_recaptchaprivtxt">'.$privtext.'</span> '."\n". |
'<input type="'.$keyentry.'" id="'.$context.'_recaptchapriv" name="'.$context.'_recaptchapriv" value="'. |
'<input type="'.$keyentry.'" id="'.$context.'_recaptchapriv" name="'.$context.'_recaptchapriv" value="'. |
$currpriv.'" size="40" /></span></td></tr></table>'."\n". |
$currpriv.'" size="40" /></span><br />'. |
|
'<span class="LC_nobreak"><span id="'.$context.'_recaptchavertxt">'.$vertext.'</span> '."\n". |
|
'<input type="'.$keyentry.'" id="'.$context.'_recaptchaversion" name="'.$context.'_recaptchaversion" value="'. |
|
$currver.'" size="3" /></span><br />'. |
|
'</td></tr></table>'."\n". |
'</td></tr>'; |
'</td></tr>'; |
return $output; |
return $output; |
} |
} |
|
|
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 4292 sub user_formats_row {
|
Line 7448 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 4387 sub print_usermodification {
|
Line 7559 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 4400 sub print_defaults {
|
Line 7575 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 4435 sub print_defaults {
|
Line 7609 sub print_defaults {
|
my $includeempty = 1; |
my $includeempty = 1; |
$datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty); |
$datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty); |
} elsif ($item eq 'lang_def') { |
} elsif ($item eq 'lang_def') { |
my %langchoices = &get_languages_hash(); |
my $includeempty = 1; |
$langchoices{''} = 'No language preference'; |
$datatable .= &Apache::loncommon::select_language($item,$defaults{$item},$includeempty); |
%langchoices = &Apache::lonlocal::texthash(%langchoices); |
|
$datatable .= &Apache::loncommon::select_form($defaults{$item},$item, |
|
\%langchoices); |
|
} else { |
} else { |
my $size; |
my $size; |
if ($item eq 'portal_def') { |
if ($item eq 'portal_def') { |
Line 4452 sub print_defaults {
|
Line 7623 sub print_defaults {
|
$rownum ++; |
$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 4477 sub print_defaults {
|
Line 7643 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"><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 4508 sub print_defaults {
|
Line 7663 sub print_defaults {
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
} |
} |
$datatable .= '</select> '.&mt('Internal ID:'). |
$datatable .= '</select> '.&mt('Internal ID:'). |
'<input type="text" size="10" name="addinststatus" value="" /></span>'. |
'<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"><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 4547 sub defaults_titles {
|
Line 7697 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 4561 sub defaults_titles {
|
Line 7714 sub defaults_titles {
|
return (\%titles); |
return (\%titles); |
} |
} |
|
|
|
sub print_scantron { |
|
my ($r,$position,$dom,$confname,$settings,$rowtotal) = @_; |
|
if ($position eq 'top') { |
|
return &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal); |
|
} else { |
|
return &print_scantronconfig($dom,$settings,\$rowtotal); |
|
} |
|
} |
|
|
|
sub scantron_javascript { |
|
return <<"ENDSCRIPT"; |
|
|
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
|
|
function toggleScantron(form) { |
|
var csvfieldset = new Array(); |
|
if (document.getElementById('scantroncsv_cols')) { |
|
csvfieldset.push(document.getElementById('scantroncsv_cols')); |
|
} |
|
if (document.getElementById('scantroncsv_options')) { |
|
csvfieldset.push(document.getElementById('scantroncsv_options')); |
|
} |
|
if (csvfieldset.length) { |
|
if (document.getElementById('scantronconfcsv')) { |
|
var scantroncsv = document.getElementById('scantronconfcsv'); |
|
if (scantroncsv.checked) { |
|
for (var i=0; i<csvfieldset.length; i++) { |
|
csvfieldset[i].style.display = 'block'; |
|
} |
|
} else { |
|
for (var i=0; i<csvfieldset.length; i++) { |
|
csvfieldset[i].style.display = 'none'; |
|
} |
|
var csvselects = document.getElementsByClassName('scantronconfig_csv'); |
|
if (csvselects.length) { |
|
for (var j=0; j<csvselects.length; j++) { |
|
csvselects[j].selectedIndex = 0; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
|
|
} |
|
|
sub print_scantronformat { |
sub print_scantronformat { |
my ($r,$dom,$confname,$settings,$rowtotal) = @_; |
my ($r,$dom,$confname,$settings,$rowtotal) = @_; |
my $itemcount = 1; |
my $itemcount = 1; |
Line 4587 sub print_scantronformat {
|
Line 7792 sub print_scantronformat {
|
if ($configuserok eq 'ok') { |
if ($configuserok eq 'ok') { |
if ($author_ok eq 'ok') { |
if ($author_ok eq 'ok') { |
my %legacyfile = ( |
my %legacyfile = ( |
default => $Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab', |
default => $Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab', |
custom => $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab', |
custom => $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab', |
); |
); |
my %md5chk; |
my %md5chk; |
foreach my $type (keys(%legacyfile)) { |
foreach my $type (keys(%legacyfile)) { |
Line 4597 sub print_scantronformat {
|
Line 7802 sub print_scantronformat {
|
} |
} |
if ($md5chk{'default'} ne $md5chk{'custom'}) { |
if ($md5chk{'default'} ne $md5chk{'custom'}) { |
foreach my $type (keys(%legacyfile)) { |
foreach my $type (keys(%legacyfile)) { |
($scantronurls{$type},my $error) = |
($scantronurls{$type},my $error) = |
&legacy_scantronformat($r,$dom,$confname, |
&legacy_scantronformat($r,$dom,$confname, |
$type,$legacyfile{$type}, |
$type,$legacyfile{$type}, |
$scantronurls{$type}, |
$scantronurls{$type}, |
Line 4608 sub print_scantronformat {
|
Line 7813 sub print_scantronformat {
|
} |
} |
if (keys(%error) == 0) { |
if (keys(%error) == 0) { |
$is_custom = 1; |
$is_custom = 1; |
$confhash{'scantron'}{'scantronformat'} = |
$confhash{'scantron'}{'scantronformat'} = |
$scantronurls{'custom'}; |
$scantronurls{'custom'}; |
my $putresult = |
my $putresult = |
&Apache::lonnet::put_dom('configuration', |
&Apache::lonnet::put_dom('configuration', |
\%confhash,$dom); |
\%confhash,$dom); |
if ($putresult ne 'ok') { |
if ($putresult ne 'ok') { |
$error{'custom'} = |
$error{'custom'} = |
'<span class="LC_error">'. |
'<span class="LC_error">'. |
&mt('An error occurred updating the domain configuration: [_1]',$putresult).'</span>'; |
&mt('An error occurred updating the domain configuration: [_1]',$putresult).'</span>'; |
} |
} |
Line 4734 sub legacy_scantronformat {
|
Line 7939 sub legacy_scantronformat {
|
return ($url,$error); |
return ($url,$error); |
} |
} |
|
|
|
sub print_scantronconfig { |
|
my ($dom,$settings,$rowtotal) = @_; |
|
my $itemcount = 2; |
|
my $is_checked = ' checked="checked"'; |
|
my %optionson = ( |
|
hdr => ' checked="checked"', |
|
pad => ' checked="checked"', |
|
rem => ' checked="checked"', |
|
); |
|
my %optionsoff = ( |
|
hdr => '', |
|
pad => '', |
|
rem => '', |
|
); |
|
my $currcsvsty = 'none'; |
|
my ($datatable,%csvfields,%checked,%onclick,%csvoptions); |
|
my @fields = &scantroncsv_fields(); |
|
my %titles = &scantronconfig_titles(); |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{config}) eq 'HASH') { |
|
if ($settings->{config}->{dat}) { |
|
$checked{'dat'} = $is_checked; |
|
} |
|
if (ref($settings->{config}->{csv}) eq 'HASH') { |
|
if (ref($settings->{config}->{csv}->{fields}) eq 'HASH') { |
|
%csvfields = %{$settings->{config}->{csv}->{fields}}; |
|
if (keys(%csvfields) > 0) { |
|
$checked{'csv'} = $is_checked; |
|
$currcsvsty = 'block'; |
|
} |
|
} |
|
if (ref($settings->{config}->{csv}->{options}) eq 'HASH') { |
|
%csvoptions = %{$settings->{config}->{csv}->{options}}; |
|
foreach my $option (keys(%optionson)) { |
|
unless ($csvoptions{$option}) { |
|
$optionsoff{$option} = $optionson{$option}; |
|
$optionson{$option} = ''; |
|
} |
|
} |
|
} |
|
} |
|
} else { |
|
$checked{'dat'} = $is_checked; |
|
} |
|
} else { |
|
$checked{'dat'} = $is_checked; |
|
} |
|
$onclick{'csv'} = ' onclick="toggleScantron(this.form);"'; |
|
my $css_class = $itemcount%2? ' class="LC_odd_row"':''; |
|
$datatable = '<tr '.$css_class.'><td>'.&mt('Supported formats').'</td>'. |
|
'<td class="LC_left_item" valign="top"><span class="LC_nobreak">'; |
|
foreach my $item ('dat','csv') { |
|
my $id; |
|
if ($item eq 'csv') { |
|
$id = 'id="scantronconfcsv" '; |
|
} |
|
$datatable .= '<label><input type="checkbox" name="scantronconfig" '.$id.'value="'.$item.'"'.$checked{$item}.$onclick{$item}.' />'. |
|
$titles{$item}.'</label>'.(' 'x3); |
|
if ($item eq 'csv') { |
|
$datatable .= '<fieldset style="display:'.$currcsvsty.'" id="scantroncsv_cols">'. |
|
'<legend>'.&mt('CSV Column Mapping').'</legend>'. |
|
'<table><tr><th>'.&mt('Field').'</th><th>'.&mt('Location').'</th></tr>'."\n"; |
|
foreach my $col (@fields) { |
|
my $selnone; |
|
if ($csvfields{$col} eq '') { |
|
$selnone = ' selected="selected"'; |
|
} |
|
$datatable .= '<tr><td>'.$titles{$col}.'</td>'. |
|
'<td><select name="scantronconfig_csv_'.$col.'" class="scantronconfig_csv">'. |
|
'<option value=""'.$selnone.'></option>'; |
|
for (my $i=0; $i<20; $i++) { |
|
my $shown = $i+1; |
|
my $sel; |
|
unless ($selnone) { |
|
if (exists($csvfields{$col})) { |
|
if ($csvfields{$col} == $i) { |
|
$sel = ' selected="selected"'; |
|
} |
|
} |
|
} |
|
$datatable .= '<option value="'.$i.'"'.$sel.'>'.$shown.'</option>'; |
|
} |
|
$datatable .= '</select></td></tr>'; |
|
} |
|
$datatable .= '</table></fieldset>'. |
|
'<fieldset style="display:'.$currcsvsty.'" id="scantroncsv_options">'. |
|
'<legend>'.&mt('CSV Options').'</legend>'; |
|
foreach my $option ('hdr','pad','rem') { |
|
$datatable .= '<span class="LC_nobreak">'.$titles{$option}.':'. |
|
'<label><input type="radio" name="scantroncsv_'.$option.'" value="1"'.$optionson{$option}.' />'. |
|
&mt('Yes').'</label>'.(' 'x2)."\n". |
|
'<label><input type="radio" name="scantroncsv_'.$option.'" value="0"'.$optionsoff{$option}.' />'.&mt('No').'</label></span><br />'; |
|
} |
|
$datatable .= '</fieldset>'; |
|
$itemcount ++; |
|
} |
|
} |
|
$datatable .= '</td></tr>'; |
|
$$rowtotal ++; |
|
return $datatable; |
|
} |
|
|
|
sub scantronconfig_titles { |
|
return &Apache::lonlocal::texthash( |
|
dat => 'Standard format (.dat)', |
|
csv => 'Comma separated values (.csv)', |
|
hdr => 'Remove first line in file (contains column titles)', |
|
pad => 'Prepend 0s to PaperID', |
|
rem => 'Remove leading spaces (except Question Response columns)', |
|
CODE => 'CODE', |
|
ID => 'Student ID', |
|
PaperID => 'Paper ID', |
|
FirstName => 'First Name', |
|
LastName => 'Last Name', |
|
FirstQuestion => 'First Question Response', |
|
Section => 'Section', |
|
); |
|
} |
|
|
|
sub scantroncsv_fields { |
|
return ('PaperID','LastName','FirstName','ID','Section','CODE','FirstQuestion'); |
|
} |
|
|
sub print_coursecategories { |
sub print_coursecategories { |
my ($position,$dom,$hdritem,$settings,$rowtotal) = @_; |
my ($position,$dom,$hdritem,$settings,$rowtotal) = @_; |
my $datatable; |
my $datatable; |
Line 4776 sub print_coursecategories {
|
Line 8104 sub print_coursecategories {
|
'<input type="radio" name="coursecat_'.$item.'" value="'.$type.'"'.$ischecked. |
'<input type="radio" name="coursecat_'.$item.'" value="'.$type.'"'.$ischecked. |
' />'.$lt{$type}.'</label> '; |
' />'.$lt{$type}.'</label> '; |
} |
} |
$datatable .= '</td></tr>'; |
$datatable .= '</span></td></tr>'; |
$itemcount ++; |
$itemcount ++; |
} |
} |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
Line 4987 sub print_coursecategories {
|
Line 8315 sub print_coursecategories {
|
$datatable .= &initialize_categories($itemcount); |
$datatable .= &initialize_categories($itemcount); |
} |
} |
} else { |
} else { |
$datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[1]->{'col2'}.'</td>' |
$datatable .= '<tr><td class="LC_right_item">'.$hdritem->{'header'}->[1]->{'col2'}.'</td></tr>' |
.&initialize_categories($itemcount); |
.&initialize_categories($itemcount); |
} |
} |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
Line 5035 sub print_serverstatuses {
|
Line 8363 sub print_serverstatuses {
|
'<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'. |
'<input type="text" name="'.$type.'_machines" '. |
'<input type="text" name="'.$type.'_machines" '. |
'value="'.$machineaccess{$type}.'" size="10" />'. |
'value="'.$machineaccess{$type}.'" size="10" />'. |
'</td></tr>'."\n"; |
'</span></td></tr>'."\n"; |
} |
} |
$$rowtotal += $rownum; |
$$rowtotal += $rownum; |
return $datatable; |
return $datatable; |
Line 5045 sub serverstatus_pages {
|
Line 8373 sub serverstatus_pages {
|
return ('userstatus','lonstatus','loncron','server-status','codeversions', |
return ('userstatus','lonstatus','loncron','server-status','codeversions', |
'checksums','clusterstatus','metadata_keywords','metadata_harvest', |
'checksums','clusterstatus','metadata_keywords','metadata_harvest', |
'takeoffline','takeonline','showenv','toggledebug','ping','domconf', |
'takeoffline','takeonline','showenv','toggledebug','ping','domconf', |
'uniquecodes','diskusage'); |
'uniquecodes','diskusage','coursecatalog'); |
} |
} |
|
|
sub defaults_javascript { |
sub defaults_javascript { |
my ($settings) = @_; |
my ($settings) = @_; |
my ($output,$jstext); |
return unless (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')) { |
my $maxnum = scalar(@{$settings->{'inststatusorder'}}); |
my $maxnum = scalar(@{$settings->{'inststatusorder'}}); |
if ($maxnum eq '') { |
if ($maxnum eq '') { |
$maxnum = 0; |
$maxnum = 0; |
} |
} |
$maxnum ++; |
$maxnum ++; |
$jstext = ' var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');'; |
my $jstext = ' var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');'; |
return <<"ENDSCRIPT"; |
return <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
Line 5111 ENDSCRIPT
|
Line 8439 ENDSCRIPT
|
} |
} |
} |
} |
|
|
|
sub passwords_javascript { |
|
my %intalert = &Apache::lonlocal::texthash ( |
|
authcheck => '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.', |
|
authcost => 'Warning: bcrypt encryption cost for internal authentication must be an integer.', |
|
passmin => 'Warning: minimum password length must be a positive integer greater than 6.', |
|
passmax => 'Warning: maximum password length must be a positive integer (or blank).', |
|
passexp => 'Warning: days before password expiration must be a positive integer (or blank).', |
|
passnum => 'Warning: number of previous passwords to save must be a positive integer (or blank).', |
|
); |
|
&js_escape(\%intalert); |
|
my $defmin = $Apache::lonnet::passwdmin; |
|
my $intauthjs = <<"ENDSCRIPT"; |
|
|
|
function warnIntAuth(field) { |
|
if (field.name == 'intauth_check') { |
|
if (field.value == '2') { |
|
alert('$intalert{authcheck}'); |
|
} |
|
} |
|
if (field.name == 'intauth_cost') { |
|
field.value.replace(/\s/g,''); |
|
if (field.value != '') { |
|
var regexdigit=/^\\d+\$/; |
|
if (!regexdigit.test(field.value)) { |
|
alert('$intalert{authcost}'); |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function warnIntPass(field) { |
|
field.value.replace(/^\s+/,''); |
|
field.value.replace(/\s+\$/,''); |
|
var regexdigit=/^\\d+\$/; |
|
if (field.name == 'passwords_min') { |
|
if (field.value == '') { |
|
alert('$intalert{passmin}'); |
|
field.value = '$defmin'; |
|
} else { |
|
if (!regexdigit.test(field.value)) { |
|
alert('$intalert{passmin}'); |
|
field.value = '$defmin'; |
|
} |
|
var minval = parseInt(field.value,10); |
|
if (minval < $defmin) { |
|
alert('$intalert{passmin}'); |
|
field.value = '$defmin'; |
|
} |
|
} |
|
} else { |
|
if (field.value == '0') { |
|
field.value = ''; |
|
} |
|
if (field.value != '') { |
|
if (field.name == 'passwords_expire') { |
|
var regexpposnum=/^\\d+(|\\.\\d*)\$/; |
|
if (!regexpposnum.test(field.value)) { |
|
alert('$intalert{passexp}'); |
|
field.value = ''; |
|
} else { |
|
var expval = parseFloat(field.value); |
|
if (expval == 0) { |
|
alert('$intalert{passexp}'); |
|
field.value = ''; |
|
} |
|
} |
|
} else { |
|
if (!regexdigit.test(field.value)) { |
|
if (field.name == 'passwords_max') { |
|
alert('$intalert{passmax}'); |
|
} else { |
|
if (field.name == 'passwords_numsaved') { |
|
alert('$intalert{passnum}'); |
|
} |
|
} |
|
field.value = ''; |
|
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
ENDSCRIPT |
|
return &Apache::lonhtmlcommon::scripttag($intauthjs); |
|
} |
|
|
sub coursecategories_javascript { |
sub coursecategories_javascript { |
my ($settings) = @_; |
my ($settings) = @_; |
my ($output,$jstext,$cathash); |
my ($output,$jstext,$cathash); |
Line 5135 sub coursecategories_javascript {
|
Line 8551 sub coursecategories_javascript {
|
} |
} |
my $instcode_reserved = &mt('The name: [_1] is a reserved category.','"instcode"'); |
my $instcode_reserved = &mt('The name: [_1] is a reserved category.','"instcode"'); |
my $communities_reserved = &mt('The name: [_1] is a reserved category.','"communities"'); |
my $communities_reserved = &mt('The name: [_1] is a reserved category.','"communities"'); |
my $choose_again = '\\n'.&mt('Please use a different name for the new top level category.'); |
my $choose_again = "\n".&mt('Please use a different name for the new top level category.'); |
|
&js_escape(\$instcode_reserved); |
|
&js_escape(\$communities_reserved); |
|
&js_escape(\$choose_again); |
$output = <<"ENDSCRIPT"; |
$output = <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
Line 5217 ENDSCRIPT
|
Line 8636 ENDSCRIPT
|
sub initialize_categories { |
sub initialize_categories { |
my ($itemcount) = @_; |
my ($itemcount) = @_; |
my ($datatable,$css_class,$chgstr); |
my ($datatable,$css_class,$chgstr); |
my %default_names = ( |
my %default_names = &Apache::lonlocal::texthash ( |
instcode => 'Official courses (with institutional codes)', |
instcode => 'Official courses (with institutional codes)', |
communities => 'Communities', |
communities => 'Communities', |
); |
); |
Line 5225 sub initialize_categories {
|
Line 8644 sub initialize_categories {
|
my $select1 = ''; |
my $select1 = ''; |
foreach my $default ('instcode','communities') { |
foreach my $default ('instcode','communities') { |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$chgstr = ' onchange="javascript:reorderCats(this.form,'."'',$default"."_pos','0'".');"'; |
$chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','0'".');"'; |
if ($default eq 'communities') { |
if ($default eq 'communities') { |
$select1 = $select0; |
$select1 = $select0; |
$select0 = ''; |
$select0 = ''; |
Line 5250 sub initialize_categories {
|
Line 8669 sub initialize_categories {
|
.'<option value="0">1</option>' |
.'<option value="0">1</option>' |
.'<option value="1">2</option>' |
.'<option value="1">2</option>' |
.'<option value="2" selected="selected">3</option></select> ' |
.'<option value="2" selected="selected">3</option></select> ' |
.&mt('Add category').'</td><td>'.&mt('Name:') |
.&mt('Add category').'</span></td><td><span class="LC_nobreak">'.&mt('Name:') |
.' <input type="text" size="20" name="addcategory_name" value="" /></td></tr>'; |
.' <input type="text" size="20" name="addcategory_name" value="" /></span>' |
|
.'</td></tr>'; |
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 5306 sub build_category_rows {
|
Line 8726 sub build_category_rows {
|
pop(@{$path}); |
pop(@{$path}); |
} |
} |
} else { |
} else { |
$text .= &mt('Add subcategory:').' </span><input type="textbox" size="20" name="addcategory_name_'; |
$text .= &mt('Add subcategory:').' </span><input type="text" size="20" name="addcategory_name_'; |
if ($j == $numchildren) { |
if ($j == $numchildren) { |
$text .= $name; |
$text .= $name; |
} else { |
} else { |
Line 5329 sub build_category_rows {
|
Line 8749 sub build_category_rows {
|
my $colspan; |
my $colspan; |
if ($parent ne 'instcode') { |
if ($parent ne 'instcode') { |
$colspan = $maxdepth - $depth - 1; |
$colspan = $maxdepth - $depth - 1; |
$text .= '<td colspan="'.$colspan.'">'.&mt('Add subcategory:').'<input type="textbox" size="20" name="subcat_'.$name.'" value="" /></td>'; |
$text .= '<td colspan="'.$colspan.'">'.&mt('Add subcategory:').'<input type="text" size="20" name="subcat_'.$name.'" value="" /></td>'; |
} |
} |
} |
} |
} |
} |
Line 5338 sub build_category_rows {
|
Line 8758 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 5379 sub modifiable_userdata_row {
|
Line 8800 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 5414 sub modifiable_userdata_row {
|
Line 8852 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 5426 sub modifiable_userdata_row {
|
Line 8865 sub modifiable_userdata_row {
|
my $check = ' '; |
my $check = ' '; |
unless ($role eq 'emailusername') { |
unless ($role eq 'emailusername') { |
if (exists($checks{$fields[$i]})) { |
if (exists($checks{$fields[$i]})) { |
$check = $checks{$fields[$i]} |
$check = $checks{$fields[$i]}; |
} else { |
} else { |
if ($role eq 'st') { |
if ($role eq 'st') { |
if (ref($settings) ne 'HASH') { |
if (ref($settings) ne 'HASH') { |
Line 5458 sub modifiable_userdata_row {
|
Line 8897 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 5472 sub modifiable_userdata_row {
|
Line 8914 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', |
|
overrides => "Override domain's helpdesk settings based on requester's affiliation", |
); |
); |
my $showdom; |
my $showdom; |
if ($context eq 'cansearch') { |
if ($context eq 'cansearch') { |
Line 5486 sub insttypes_row {
|
Line 8931 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 5510 sub insttypes_row {
|
Line 8968 sub insttypes_row {
|
if (grep(/^\Q$types->[$i]\E$/,@{$settings->{$context}})) { |
if (grep(/^\Q$types->[$i]\E$/,@{$settings->{$context}})) { |
$check = ' checked="checked" '; |
$check = ' checked="checked" '; |
} |
} |
|
} elsif (ref($settings->{$context}) eq 'HASH') { |
|
if (ref($settings->{$context}->{$types->[$i]}) eq 'HASH') { |
|
$check = ' checked="checked" '; |
|
} |
} elsif ($context eq 'statustocreate') { |
} elsif ($context eq 'statustocreate') { |
$check = ' checked="checked" '; |
$check = ' checked="checked" '; |
} |
} |
Line 5517 sub insttypes_row {
|
Line 8979 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>'; |
} |
} |
} |
} |
$rem = @{$types}%($numinrow); |
$rem = @{$types}%($numinrow); |
} |
} |
my $colsleft = $numinrow - $rem; |
my $colsleft = $numinrow - $rem; |
if (($rem == 0) && (@{$types} > 0)) { |
if ($context eq 'overrides') { |
$output .= '<tr>'; |
if ($colsleft > 1) { |
} |
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
if ($colsleft > 1) { |
} else { |
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
$output .= '<td class="LC_left_item">'; |
|
} |
|
$output .= ' '; |
} else { |
} else { |
$output .= '<td class="LC_left_item">'; |
if ($rem == 0) { |
} |
$output .= '<tr>'; |
my $defcheck = ' '; |
} |
if (ref($settings) eq 'HASH') { |
if ($colsleft > 1) { |
if (ref($settings->{$context}) eq 'ARRAY') { |
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
if (grep(/^default$/,@{$settings->{$context}})) { |
} else { |
|
$output .= '<td class="LC_left_item">'; |
|
} |
|
my $defcheck = ' '; |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{$context}) eq 'ARRAY') { |
|
if (grep(/^default$/,@{$settings->{$context}})) { |
|
$defcheck = ' checked="checked" '; |
|
} |
|
} elsif ($context eq 'statustocreate') { |
$defcheck = ' checked="checked" '; |
$defcheck = ' checked="checked" '; |
} |
} |
} elsif ($context eq 'statustocreate') { |
|
$defcheck = ' checked="checked" '; |
|
} |
} |
|
$output .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="'.$context.'" '. |
|
'value="default"'.$defcheck.$onclick.' />'. |
|
$othertitle.'</label></span>'; |
} |
} |
$output .= '<span class="LC_nobreak"><label>'. |
$output .= '</td></tr></table></td></tr>'; |
'<input type="checkbox" name="'.$context.'" '. |
|
'value="default"'.$defcheck.'/>'. |
|
$othertitle.'</label></span></td>'. |
|
'</tr></table></td></tr>'; |
|
return $output; |
return $output; |
} |
} |
|
|
Line 5623 sub usertype_update_row {
|
Line 9094 sub usertype_update_row {
|
sub modify_login { |
sub modify_login { |
my ($r,$dom,$confname,$lastactref,%domconfig) = @_; |
my ($r,$dom,$confname,$lastactref,%domconfig) = @_; |
my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl, |
my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl, |
%curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon); |
%curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon, |
|
%currsaml,%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlnotsso); |
%title = ( coursecatalog => 'Display course catalog', |
%title = ( coursecatalog => 'Display course catalog', |
adminmail => 'Display administrator E-mail address', |
adminmail => 'Display administrator E-mail address', |
helpdesk => 'Display "Contact Helpdesk" link', |
helpdesk => 'Display "Contact Helpdesk" link', |
newuser => 'Link for visitors to create a user account', |
newuser => 'Link for visitors to create a user account', |
loginheader => 'Log-in box header'); |
loginheader => 'Log-in box header', |
|
saml => 'Dual SSO and non-SSO login'); |
@offon = ('off','on'); |
@offon = ('off','on'); |
if (ref($domconfig{login}) eq 'HASH') { |
if (ref($domconfig{login}) eq 'HASH') { |
if (ref($domconfig{login}{loginvia}) eq 'HASH') { |
if (ref($domconfig{login}{loginvia}) eq 'HASH') { |
Line 5636 sub modify_login {
|
Line 9109 sub modify_login {
|
$curr_loginvia{$lonhost} = $domconfig{login}{loginvia}{$lonhost}; |
$curr_loginvia{$lonhost} = $domconfig{login}{loginvia}{$lonhost}; |
} |
} |
} |
} |
|
if (ref($domconfig{login}{'saml'}) eq 'HASH') { |
|
foreach my $lonhost (keys(%{$domconfig{login}{'saml'}})) { |
|
if (ref($domconfig{login}{'saml'}{$lonhost}) eq 'HASH') { |
|
$currsaml{$lonhost} = $domconfig{login}{'saml'}{$lonhost}; |
|
$saml{$lonhost} = 1; |
|
$samltext{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'text'}; |
|
$samlurl{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'url'}; |
|
$samlalt{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'alt'}; |
|
$samlimg{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'img'}; |
|
$samltitle{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'title'}; |
|
$samlnotsso{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'notsso'}; |
|
} |
|
} |
|
} |
} |
} |
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], |
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], |
\%domconfig,\%loginhash); |
\%domconfig,\%loginhash); |
Line 5650 sub modify_login {
|
Line 9137 sub modify_login {
|
} |
} |
|
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
|
my %domservers = &Apache::lonnet::get_servers($dom); |
my @loginvia_attribs = ('serverpath','custompath','exempt'); |
my @loginvia_attribs = ('serverpath','custompath','exempt'); |
if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
foreach my $lonhost (keys(%servers)) { |
foreach my $lonhost (keys(%servers)) { |
Line 5692 sub modify_login {
|
Line 9180 sub modify_login {
|
$changes{'loginvia'}{$lonhost} = 1; |
$changes{'loginvia'}{$lonhost} = 1; |
} |
} |
if ($item eq 'exempt') { |
if ($item eq 'exempt') { |
$new =~ s/^\s+//; |
$new = &check_exempt_addresses($new); |
$new =~ s/\s+$//; |
|
my @poss_ips = split(/\s*[,:]\s*/,$new); |
|
my @okips; |
|
foreach my $ip (@poss_ips) { |
|
if ($ip =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) { |
|
if (($1 <= 255) && ($2 <= 255) && ($3 <= 255) && ($4 <= 255)) { |
|
push(@okips,$ip); |
|
} |
|
} |
|
} |
|
if (@okips > 0) { |
|
$new = join(',',@okips); |
|
} else { |
|
$new = ''; |
|
} |
|
} |
} |
$loginhash{login}{loginvia}{$lonhost}{$item} = $new; |
$loginhash{login}{loginvia}{$lonhost}{$item} = $new; |
} |
} |
Line 5803 sub modify_login {
|
Line 9276 sub modify_login {
|
$errors .= '<li><span class="LC_error">'.$puberror.'</span></li>'; |
$errors .= '<li><span class="LC_error">'.$puberror.'</span></li>'; |
if ((grep(/^\Q$lang\E$/,@currlangs)) && |
if ((grep(/^\Q$lang\E$/,@currlangs)) && |
(!grep(/^\Q$lang\E$/,@delurls))) { |
(!grep(/^\Q$lang\E$/,@delurls))) { |
|
|
$loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang}; |
$loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang}; |
} |
} |
} |
} |
Line 5819 sub modify_login {
|
Line 9291 sub modify_login {
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
} |
} |
} |
} |
|
|
|
my (%currheadtagurls,%currexempt,@newhosts,%newheadtagurls,%possexempt); |
|
if (ref($domconfig{'login'}) eq 'HASH') { |
|
if (ref($domconfig{'login'}{'headtag'}) eq 'HASH') { |
|
foreach my $lonhost (keys(%{$domconfig{'login'}{'headtag'}})) { |
|
if ($domservers{$lonhost}) { |
|
if (ref($domconfig{'login'}{'headtag'}{$lonhost}) eq 'HASH') { |
|
$currheadtagurls{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'url'}; |
|
$currexempt{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'exempt'}; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
my @delheadtagurls = &Apache::loncommon::get_env_multiple('form.loginheadtag_del'); |
|
foreach my $lonhost (sort(keys(%domservers))) { |
|
if (grep(/^\Q$lonhost\E$/,@delheadtagurls)) { |
|
$changes{'headtag'}{$lonhost} = 1; |
|
} else { |
|
if ($env{'form.loginheadtagexempt_'.$lonhost}) { |
|
$possexempt{$lonhost} = &check_exempt_addresses($env{'form.loginheadtagexempt_'.$lonhost}); |
|
} |
|
if ($env{'form.loginheadtag_'.$lonhost.'.filename'}) { |
|
push(@newhosts,$lonhost); |
|
} elsif ($currheadtagurls{$lonhost}) { |
|
$loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $currheadtagurls{$lonhost}; |
|
if ($currexempt{$lonhost}) { |
|
if ((!exists($possexempt{$lonhost})) || ($possexempt{$lonhost} ne $currexempt{$lonhost})) { |
|
$changes{'headtag'}{$lonhost} = 1; |
|
} |
|
} elsif ($possexempt{$lonhost}) { |
|
$changes{'headtag'}{$lonhost} = 1; |
|
} |
|
if ($possexempt{$lonhost}) { |
|
$loginhash{'login'}{'headtag'}{$lonhost}{'exempt'} = $possexempt{$lonhost}; |
|
} |
|
} |
|
} |
|
} |
|
if (@newhosts) { |
|
my $error; |
|
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
|
if ($configuserok eq 'ok') { |
|
if ($switchserver) { |
|
$error = &mt("Upload of custom markup is not permitted to this server: [_1]",$switchserver); |
|
} elsif ($author_ok eq 'ok') { |
|
foreach my $lonhost (@newhosts) { |
|
my $formelem = 'loginheadtag_'.$lonhost; |
|
(my $result,$newheadtagurls{$lonhost}) = &publishlogo($r,'upload',$formelem,$dom,$confname, |
|
"login/headtag/$lonhost",'','', |
|
$env{'form.loginheadtag_'.$lonhost.'.filename'}); |
|
if ($result eq 'ok') { |
|
$loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $newheadtagurls{$lonhost}; |
|
$changes{'headtag'}{$lonhost} = 1; |
|
if ($possexempt{$lonhost}) { |
|
$loginhash{'login'}{'headtag'}{$lonhost}{'exempt'} = $possexempt{$lonhost}; |
|
} |
|
} else { |
|
my $puberror = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].", |
|
$newheadtagurls{$lonhost},$result); |
|
$errors .= '<li><span class="LC_error">'.$puberror.'</span></li>'; |
|
if ((grep(/^\Q$lonhost\E$/,keys(%currheadtagurls))) && |
|
(!grep(/^\Q$lonhost\E$/,@delheadtagurls))) { |
|
$loginhash{'login'}{'headtag'}{$lonhost} = $currheadtagurls{$lonhost}; |
|
} |
|
} |
|
} |
|
} else { |
|
$error = &mt("Upload of custom markup file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2]. Error was: [_3].",$confname,$dom,$author_ok); |
|
} |
|
} else { |
|
$error = &mt("Upload of custom markup file(s) failed because a Domain Configuration user ([_1]) could not be created in domain: [_2]. Error was: [_3].",$confname,$dom,$configuserok); |
|
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} |
|
my @delsamlimg = &Apache::loncommon::get_env_multiple('form.saml_img_del'); |
|
my @newsamlimgs; |
|
foreach my $lonhost (keys(%domservers)) { |
|
if ($env{'form.saml_'.$lonhost}) { |
|
if ($env{'form.saml_img_'.$lonhost.'.filename'}) { |
|
push(@newsamlimgs,$lonhost); |
|
} |
|
foreach my $item ('text','alt','url','title','notsso') { |
|
$env{'form.saml_'.$item.'_'.$lonhost} =~ s/^\s+|\s+$//g; |
|
} |
|
if ($saml{$lonhost}) { |
|
if (grep(/^\Q$lonhost\E$/,@delsamlimg)) { |
|
#FIXME Need to obsolete published image |
|
delete($currsaml{$lonhost}{'img'}); |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
if ($env{'form.saml_alt_'.$lonhost} ne $samlalt{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
if ($env{'form.saml_text_'.$lonhost} ne $samltext{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
if ($env{'form.saml_url_'.$lonhost} ne $samlurl{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
if ($env{'form.saml_title_'.$lonhost} ne $samltitle{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
if ($env{'form.saml_notsso_'.$lonhost} ne $samlnotsso{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
} else { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
foreach my $item ('text','alt','url','title','notsso') { |
|
$currsaml{$lonhost}{$item} = $env{'form.saml_'.$item.'_'.$lonhost}; |
|
} |
|
} else { |
|
if ($saml{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
delete($currsaml{$lonhost}); |
|
} |
|
} |
|
} |
|
foreach my $posshost (keys(%currsaml)) { |
|
unless (exists($domservers{$posshost})) { |
|
delete($currsaml{$posshost}); |
|
} |
|
} |
|
%{$loginhash{'login'}{'saml'}} = %currsaml; |
|
if (@newsamlimgs) { |
|
my $error; |
|
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
|
if ($configuserok eq 'ok') { |
|
if ($switchserver) { |
|
$error = &mt("Upload of SSO Button Image is not permitted to this server: [_1].",$switchserver); |
|
} elsif ($author_ok eq 'ok') { |
|
foreach my $lonhost (@newsamlimgs) { |
|
my $formelem = 'saml_img_'.$lonhost; |
|
my ($result,$imgurl) = &publishlogo($r,'upload',$formelem,$dom,$confname, |
|
"login/saml/$lonhost",'','', |
|
$env{'form.saml_img_'.$lonhost.'.filename'}); |
|
if ($result eq 'ok') { |
|
$currsaml{$lonhost}{'img'} = $imgurl; |
|
$loginhash{'login'}{'saml'}{$lonhost}{'img'} = $imgurl; |
|
$changes{'saml'}{$lonhost} = 1; |
|
} else { |
|
my $puberror = &mt("Upload of SSO button image failed for [_1] because an error occurred publishing the file in RES space. Error was: [_2].", |
|
$lonhost,$result); |
|
$errors .= '<li><span class="LC_error">'.$puberror.'</span></li>'; |
|
} |
|
} |
|
} else { |
|
$error = &mt("Upload of SSO button image file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2]. Error was: [_3].",$confname,$dom,$author_ok); |
|
} |
|
} else { |
|
$error = &mt("Upload of SSO button image file(s) failed because a Domain Configuration user ([_1]) could not be created in domain: [_2]. Error was: [_3].",$confname,$dom,$configuserok); |
|
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} |
&process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'}); |
&process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'}); |
|
|
my $defaulthelpfile = '/adm/loginproblems.html'; |
my $defaulthelpfile = '/adm/loginproblems.html'; |
Line 5859 sub modify_login {
|
Line 9492 sub modify_login {
|
} |
} |
if (keys(%changes) > 0 || $colchgtext) { |
if (keys(%changes) > 0 || $colchgtext) { |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
|
if (exists($changes{'saml'})) { |
|
my $hostid_in_use; |
|
my @hosts = &Apache::lonnet::current_machine_ids(); |
|
if (@hosts > 1) { |
|
foreach my $hostid (@hosts) { |
|
if (&Apache::lonnet::host_domain($hostid) eq $dom) { |
|
$hostid_in_use = $hostid; |
|
last; |
|
} |
|
} |
|
} else { |
|
$hostid_in_use = $r->dir_config('lonHostID'); |
|
} |
|
if (($hostid_in_use) && |
|
(&Apache::lonnet::host_domain($hostid_in_use) eq $dom)) { |
|
&Apache::lonnet::devalidate_cache_new('samllanding',$hostid_in_use); |
|
} |
|
if (ref($lastactref) eq 'HASH') { |
|
if (ref($changes{'saml'}) eq 'HASH') { |
|
my %updates; |
|
map { $updates{$_} = 1; } keys(%{$changes{'saml'}}); |
|
$lastactref->{'samllanding'} = \%updates; |
|
} |
|
} |
|
} |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
$lastactref->{'domainconfig'} = 1; |
$lastactref->{'domainconfig'} = 1; |
} |
} |
Line 5919 sub modify_login {
|
Line 9577 sub modify_login {
|
} |
} |
} |
} |
} |
} |
|
} elsif ($item eq 'headtag') { |
|
if (ref($changes{$item}) eq 'HASH') { |
|
foreach my $lonhost (sort(keys(%{$changes{$item}}))) { |
|
if (grep(/^\Q$lonhost\E$/,@delheadtagurls)) { |
|
$resulttext .= '<li>'.&mt('custom markup file removed for [_1]',$domservers{$lonhost}).'</li>'; |
|
} elsif (ref($loginhash{'login'}{'headtag'}{$lonhost}) eq 'HASH') { |
|
$resulttext .= '<li><a href="'. |
|
"javascript:void(open('$loginhash{'login'}{'headtag'}{$lonhost}{'url'}?inhibitmenu=yes','Custom_HeadTag', |
|
'menubar=0,toolbar=1,scrollbars=1,width=600,height=500,resizable=yes'))". |
|
'">'.&mt('custom markup').'</a> '.&mt('(for [_1])',$servers{$lonhost}).' '; |
|
if ($possexempt{$lonhost}) { |
|
$resulttext .= &mt('not included for client IP(s): [_1]',$possexempt{$lonhost}); |
|
} else { |
|
$resulttext .= &mt('included for any client IP'); |
|
} |
|
$resulttext .= '</li>'; |
|
} |
|
} |
|
} |
|
} elsif ($item eq 'saml') { |
|
if (ref($changes{$item}) eq 'HASH') { |
|
my %notlt = ( |
|
text => 'Text for log-in by SSO', |
|
img => 'SSO button image', |
|
alt => 'Alt text for button image', |
|
url => 'SSO URL', |
|
title => 'Tooltip for SSO link', |
|
notsso => 'Text for non-SSO log-in', |
|
); |
|
foreach my $lonhost (sort(keys(%{$changes{$item}}))) { |
|
if (ref($currsaml{$lonhost}) eq 'HASH') { |
|
$resulttext .= '<li>'.&mt("$title{$item} in use for [_1]","<b>$lonhost</b>"). |
|
'<ul>'; |
|
foreach my $key ('text','img','alt','url','title','notsso') { |
|
if ($currsaml{$lonhost}{$key} eq '') { |
|
$resulttext .= '<li>'.&mt("$notlt{$key} not in use").'</li>'; |
|
} else { |
|
my $value = "'$currsaml{$lonhost}{$key}'"; |
|
if ($key eq 'img') { |
|
$value = '<img src="'.$currsaml{$lonhost}{$key}.'" />'; |
|
} |
|
$resulttext .= '<li>'.&mt("$notlt{$key} set to: [_1]", |
|
$value).'</li>'; |
|
} |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt("$title{$item} not in use for [_1]",$lonhost).'</li>'; |
|
} |
|
} |
|
} |
} elsif ($item eq 'captcha') { |
} elsif ($item eq 'captcha') { |
if (ref($loginhash{'login'}) eq 'HASH') { |
if (ref($loginhash{'login'}) eq 'HASH') { |
my $chgtxt; |
my $chgtxt; |
Line 5950 sub modify_login {
|
Line 9659 sub modify_login {
|
if (!$privkey) { |
if (!$privkey) { |
$chgtxt .= '<li>'.&mt('Private key deleted').'</li>'; |
$chgtxt .= '<li>'.&mt('Private key deleted').'</li>'; |
} else { |
} else { |
$chgtxt .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>'; |
$chgtxt .= '<li>'.&mt('Private key set to [_1]',$privkey).'</li>'; |
} |
} |
$chgtxt .= '</ul>'; |
$chgtxt .= '</ul>'; |
$resulttext .= '<li>'.$chgtxt.'</li>'; |
$resulttext .= '<li>'.$chgtxt.'</li>'; |
} |
} |
|
} elsif ($item eq 'recaptchaversion') { |
|
if (ref($loginhash{'login'}) eq 'HASH') { |
|
if ($loginhash{'login'}{'captcha'} eq 'recaptcha') { |
|
$resulttext .= '<li>'.&mt('ReCAPTCHA for helpdesk form set to version [_1]',$loginhash{'login'}{'recaptchaversion'}). |
|
'</li>'; |
|
} |
|
} |
} else { |
} else { |
$resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>'; |
$resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>'; |
} |
} |
Line 5974 sub modify_login {
|
Line 9690 sub modify_login {
|
return $resulttext; |
return $resulttext; |
} |
} |
|
|
|
sub check_exempt_addresses { |
|
my ($iplist) = @_; |
|
$iplist =~ s/^\s+//; |
|
$iplist =~ s/\s+$//; |
|
my @poss_ips = split(/\s*[,:]\s*/,$iplist); |
|
my (@okips,$new); |
|
foreach my $ip (@poss_ips) { |
|
if ($ip =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) { |
|
if (($1 <= 255) && ($2 <= 255) && ($3 <= 255) && ($4 <= 255)) { |
|
push(@okips,$ip); |
|
} |
|
} |
|
} |
|
if (@okips > 0) { |
|
$new = join(',',@okips); |
|
} else { |
|
$new = ''; |
|
} |
|
return $new; |
|
} |
|
|
sub color_font_choices { |
sub color_font_choices { |
my %choices = |
my %choices = |
&Apache::lonlocal::texthash ( |
&Apache::lonlocal::texthash ( |
Line 5993 sub color_font_choices {
|
Line 9730 sub color_font_choices {
|
return %choices; |
return %choices; |
} |
} |
|
|
|
sub modify_ipaccess { |
|
my ($dom,$lastactref,%domconfig) = @_; |
|
my (@allpos,%changes,%confhash,$errors,$resulttext); |
|
my (@items,%deletions,%itemids,@warnings); |
|
my ($typeorder,$types) = &commblocktype_text(); |
|
if ($env{'form.ipaccess_add'}) { |
|
my $name = $env{'form.ipaccess_name_add'}; |
|
my ($newid,$error) = &get_ipaccess_id($dom,$name); |
|
if ($newid) { |
|
$itemids{'add'} = $newid; |
|
push(@items,'add'); |
|
$changes{$newid} = 1; |
|
} else { |
|
$error = &mt('Failed to acquire unique ID for new IP access control item'); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} |
|
if (ref($domconfig{'ipaccess'}) eq 'HASH') { |
|
my @todelete = &Apache::loncommon::get_env_multiple('form.ipaccess_del'); |
|
if (@todelete) { |
|
map { $deletions{$_} = 1; } @todelete; |
|
} |
|
my $maxnum = $env{'form.ipaccess_maxnum'}; |
|
for (my $i=0; $i<$maxnum; $i++) { |
|
my $itemid = $env{'form.ipaccess_id_'.$i}; |
|
$itemid =~ s/\D+//g; |
|
if (ref($domconfig{'ipaccess'}{$itemid}) eq 'HASH') { |
|
if ($deletions{$itemid}) { |
|
$changes{$itemid} = $domconfig{'ipaccess'}{$itemid}{'name'}; |
|
} else { |
|
push(@items,$i); |
|
$itemids{$i} = $itemid; |
|
} |
|
} |
|
} |
|
} |
|
foreach my $idx (@items) { |
|
my $itemid = $itemids{$idx}; |
|
next unless ($itemid); |
|
my %current; |
|
unless ($idx eq 'add') { |
|
if (ref($domconfig{'ipaccess'}{$itemid}) eq 'HASH') { |
|
%current = %{$domconfig{'ipaccess'}{$itemid}}; |
|
} |
|
} |
|
my $position = $env{'form.ipaccess_pos_'.$itemid}; |
|
$position =~ s/\D+//g; |
|
if ($position ne '') { |
|
$allpos[$position] = $itemid; |
|
} |
|
my $name = $env{'form.ipaccess_name_'.$idx}; |
|
$name =~ s/^\s+|\s+$//g; |
|
$confhash{$itemid}{'name'} = $name; |
|
my $possrange = $env{'form.ipaccess_range_'.$idx}; |
|
$possrange =~ s/^\s+|\s+$//g; |
|
unless ($possrange eq '') { |
|
$possrange =~ s/[\r\n]+/\s/g; |
|
$possrange =~ s/\s*-\s*/-/g; |
|
$possrange =~ s/\s+/,/g; |
|
$possrange =~ s/,+/,/g; |
|
if ($possrange ne '') { |
|
my (@ok,$count); |
|
$count = 0; |
|
foreach my $poss (split(/\,/,$possrange)) { |
|
$count ++; |
|
$poss = &validate_ip_pattern($poss); |
|
if ($poss ne '') { |
|
push(@ok,$poss); |
|
} |
|
} |
|
my $diff = $count - scalar(@ok); |
|
if ($diff) { |
|
$errors .= '<li><span class="LC_error">'. |
|
&mt('[quant,_1,IP] invalid and excluded from saved value for IP range(s) for [_2]', |
|
$diff,$name). |
|
'</span></li>'; |
|
} |
|
if (@ok) { |
|
my @cidr_list; |
|
foreach my $item (@ok) { |
|
@cidr_list = &Net::CIDR::cidradd($item,@cidr_list); |
|
} |
|
$confhash{$itemid}{'ip'} = join(',',@cidr_list); |
|
} |
|
} |
|
} |
|
foreach my $field ('name','ip') { |
|
unless (($idx eq 'add') || ($changes{$itemid})) { |
|
if ($current{$field} ne $confhash{$itemid}{$field}) { |
|
$changes{$itemid} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
$confhash{$itemid}{'commblocks'} = {}; |
|
|
|
my %commblocks; |
|
map { $commblocks{$_} = 1; } &Apache::loncommon::get_env_multiple('form.ipaccess_block_'.$idx); |
|
foreach my $type (@{$typeorder}) { |
|
if ($commblocks{$type}) { |
|
$confhash{$itemid}{'commblocks'}{$type} = 'on'; |
|
} |
|
unless (($idx eq 'add') || ($changes{$itemid})) { |
|
if (ref($current{'commblocks'}) eq 'HASH') { |
|
if ($confhash{$itemid}{'commblocks'}{$type} ne $current{'commblocks'}{$type}) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif ($confhash{$itemid}{'commblocks'}{$type}) { |
|
$changes{$itemid} = 1; |
|
} |
|
} |
|
} |
|
$confhash{$itemid}{'courses'} = {}; |
|
my %crsdeletions; |
|
my @delcrs = &Apache::loncommon::get_env_multiple('form.ipaccess_course_delete_'.$idx); |
|
if (@delcrs) { |
|
map { $crsdeletions{$_} = 1; } @delcrs; |
|
} |
|
if (ref($current{'courses'}) eq 'HASH') { |
|
foreach my $cid (sort(keys(%{$current{'courses'}}))) { |
|
if ($crsdeletions{$cid}) { |
|
$changes{$itemid} = 1; |
|
} else { |
|
$confhash{$itemid}{'courses'}{$cid} = 1; |
|
} |
|
} |
|
} |
|
$env{'form.ipaccess_cnum_'.$idx} =~ s/^\s+|\s+$//g; |
|
$env{'form.ipaccess_cdom_'.$idx} =~ s/^\s+|\s+$//g; |
|
if (($env{'form.ipaccess_cnum_'.$idx} =~ /^$match_courseid$/) && |
|
($env{'form.ipaccess_cdom_'.$idx} =~ /^$match_domain$/)) { |
|
if (&Apache::lonnet::homeserver($env{'form.ipaccess_cnum_'.$idx}, |
|
$env{'form.ipaccess_cdom_'.$idx}) eq 'no_host') { |
|
$errors .= '<li><span class="LC_error">'. |
|
&mt('Invalid courseID [_1] omitted from list of allowed courses', |
|
$env{'form.ipaccess_cdom_'.$idx}.'_'.$env{'form.ipaccess_cnum_'.$idx}). |
|
'</span></li>'; |
|
} else { |
|
$confhash{$itemid}{'courses'}{$env{'form.ipaccess_cdom_'.$idx}.'_'.$env{'form.ipaccess_cnum_'.$idx}} = 1; |
|
$changes{$itemid} = 1; |
|
} |
|
} |
|
} |
|
if (@allpos > 0) { |
|
my $idx = 0; |
|
foreach my $itemid (@allpos) { |
|
if ($itemid ne '') { |
|
$confhash{$itemid}{'order'} = $idx; |
|
unless ($changes{$itemid}) { |
|
if (ref($domconfig{'ipaccess'}) eq 'HASH') { |
|
if (ref($domconfig{'ipaccess'}{$itemid}) eq 'HASH') { |
|
if ($domconfig{'ipaccess'}{$itemid}{'order'} ne $idx) { |
|
$changes{$itemid} = 1; |
|
} |
|
} |
|
} |
|
} |
|
$idx ++; |
|
} |
|
} |
|
} |
|
if (keys(%changes)) { |
|
my %defaultshash = ( |
|
ipaccess => \%confhash, |
|
); |
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
|
$dom); |
|
if ($putresult eq 'ok') { |
|
my $cachetime = 1800; |
|
&Apache::lonnet::do_cache_new('ipaccess',$dom,\%confhash,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'ipaccess'} = 1; |
|
} |
|
$resulttext = &mt('Changes made:').'<ul>'; |
|
my %bynum; |
|
foreach my $itemid (sort(keys(%changes))) { |
|
if (ref($confhash{$itemid}) eq 'HASH') { |
|
my $position = $confhash{$itemid}{'order'}; |
|
if ($position =~ /^\d+$/) { |
|
$bynum{$position} = $itemid; |
|
} |
|
} |
|
} |
|
if (keys(%deletions)) { |
|
foreach my $itemid (sort { $a <=> $b } keys(%deletions)) { |
|
$resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>'; |
|
} |
|
} |
|
foreach my $pos (sort { $a <=> $b } keys(%bynum)) { |
|
my $itemid = $bynum{$pos}; |
|
if (ref($confhash{$itemid}) eq 'HASH') { |
|
$resulttext .= '<li><b>'.$confhash{$itemid}{'name'}.'</b><ul>'; |
|
my $position = $pos + 1; |
|
$resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>'; |
|
if ($confhash{$itemid}{'ip'} eq '') { |
|
$resulttext .= '<li>'.&mt('No IP Range(s) set').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('IP Range(s): [_1]',$confhash{$itemid}{'ip'}).'</li>'; |
|
} |
|
if (keys(%{$confhash{$itemid}{'commblocks'}})) { |
|
$resulttext .= '<li>'.&mt('Functionality Blocked: [_1]', |
|
join(', ', map { $types->{$_}; } sort(keys(%{$confhash{$itemid}{'commblocks'}})))). |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No functionality blocked').'</li>'; |
|
} |
|
if (keys(%{$confhash{$itemid}{'courses'}})) { |
|
my @courses; |
|
foreach my $cid (sort(keys(%{$confhash{$itemid}{'courses'}}))) { |
|
my %courseinfo = &Apache::lonnet::coursedescription($cid,{'one_time' => 1}); |
|
push(@courses,$courseinfo{'description'}.' ('.$cid.')'); |
|
} |
|
$resulttext .= '<li>'.&mt('Courses/Communities allowed').':<ul><li>'. |
|
join('</li><li>',@courses).'</li></ul>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No courses allowed').'</li>'; |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
|
} |
|
$resulttext .= '</ul>'; |
|
} else { |
|
$errors .= '<li><span class="LC_error">'.&mt('Failed to save changes').'</span></li>'; |
|
} |
|
} else { |
|
$resulttext = &mt('No changes made'); |
|
} |
|
if ($errors) { |
|
$resulttext .= '<p>'.&mt('The following errors occurred: ').'<ul>'. |
|
$errors.'</ul></p>'; |
|
} |
|
return $resulttext; |
|
} |
|
|
|
sub get_ipaccess_id { |
|
my ($domain,$location) = @_; |
|
# get lock on ipaccess db |
|
my $lockhash = { |
|
lock => $env{'user.name'}. |
|
':'.$env{'user.domain'}, |
|
}; |
|
my $tries = 0; |
|
my $gotlock = &Apache::lonnet::newput_dom('ipaccess',$lockhash,$domain); |
|
my ($id,$error); |
|
|
|
while (($gotlock ne 'ok') && ($tries<10)) { |
|
$tries ++; |
|
sleep (0.1); |
|
$gotlock = &Apache::lonnet::newput_dom('ipaccess',$lockhash,$domain); |
|
} |
|
if ($gotlock eq 'ok') { |
|
my %currids = &Apache::lonnet::dump_dom('ipaccess',$domain); |
|
if ($currids{'lock'}) { |
|
delete($currids{'lock'}); |
|
if (keys(%currids)) { |
|
my @curr = sort { $a <=> $b } keys(%currids); |
|
if ($curr[-1] =~ /^\d+$/) { |
|
$id = 1 + $curr[-1]; |
|
} |
|
} else { |
|
$id = 1; |
|
} |
|
if ($id) { |
|
unless (&Apache::lonnet::newput_dom('ipaccess',{ $id => $location },$domain) eq 'ok') { |
|
$error = 'nostore'; |
|
} |
|
} else { |
|
$error = 'nonumber'; |
|
} |
|
} |
|
my $dellockoutcome = &Apache::lonnet::del_dom('ipaccess',['lock'],$domain); |
|
} else { |
|
$error = 'nolock'; |
|
} |
|
return ($id,$error); |
|
} |
|
|
sub modify_rolecolors { |
sub modify_rolecolors { |
my ($r,$dom,$confname,$roles,$lastactref,%domconfig) = @_; |
my ($r,$dom,$confname,$roles,$lastactref,%domconfig) = @_; |
my ($resulttext,%rolehash); |
my ($resulttext,%rolehash); |
Line 6100 sub modify_colors {
|
Line 10114 sub modify_colors {
|
$domconfig->{$role} = {}; |
$domconfig->{$role} = {}; |
} |
} |
foreach my $img (@images) { |
foreach my $img (@images) { |
if (($role eq 'login') && (($img eq 'img') || ($img eq 'logo'))) { |
if ($role eq 'login') { |
if (defined($env{'form.login_showlogo_'.$img})) { |
if (($img eq 'img') || ($img eq 'logo')) { |
$confhash->{$role}{'showlogo'}{$img} = 1; |
if (defined($env{'form.login_showlogo_'.$img})) { |
} else { |
$confhash->{$role}{'showlogo'}{$img} = 1; |
$confhash->{$role}{'showlogo'}{$img} = 0; |
} else { |
|
$confhash->{$role}{'showlogo'}{$img} = 0; |
|
} |
} |
} |
} |
if ($env{'form.login_alt_'.$img} ne '') { |
|
$confhash->{$role}{'alttext'}{$img} = $env{'form.login_alt_'.$img}; |
|
} |
|
} |
if ( ! $env{'form.'.$role.'_'.$img.'.filename'} |
if ( ! $env{'form.'.$role.'_'.$img.'.filename'} |
&& !defined($domconfig->{$role}{$img}) |
&& !defined($domconfig->{$role}{$img}) |
&& !$env{'form.'.$role.'_del_'.$img} |
&& !$env{'form.'.$role.'_del_'.$img} |
Line 6181 sub modify_colors {
|
Line 10200 sub modify_colors {
|
$changes{$role}{'images'}{$img} = 1; |
$changes{$role}{'images'}{$img} = 1; |
} |
} |
} |
} |
if (($role eq 'login') && (($img eq 'logo') || ($img eq 'img'))) { |
if ($role eq 'login') { |
if (ref($domconfig->{'login'}{'showlogo'}) eq 'HASH') { |
if (($img eq 'logo') || ($img eq 'img')) { |
if ($confhash->{$role}{'showlogo'}{$img} ne |
if (ref($domconfig->{'login'}{'showlogo'}) eq 'HASH') { |
$domconfig->{$role}{'showlogo'}{$img}) { |
if ($confhash->{$role}{'showlogo'}{$img} ne |
$changes{$role}{'showlogo'}{$img} = 1; |
$domconfig->{$role}{'showlogo'}{$img}) { |
|
$changes{$role}{'showlogo'}{$img} = 1; |
|
} |
|
} else { |
|
if ($confhash->{$role}{'showlogo'}{$img} == 0) { |
|
$changes{$role}{'showlogo'}{$img} = 1; |
|
} |
} |
} |
} else { |
} |
if ($confhash->{$role}{'showlogo'}{$img} == 0) { |
if ($img ne 'login') { |
$changes{$role}{'showlogo'}{$img} = 1; |
if (ref($domconfig->{$role}{'alttext'}) eq 'HASH') { |
|
if ($confhash->{$role}{'alttext'}{$img} ne |
|
$domconfig->{$role}{'alttext'}{$img}) { |
|
$changes{$role}{'alttext'}{$img} = 1; |
|
} |
|
} else { |
|
if ($confhash->{$role}{'alttext'}{$img} ne '') { |
|
$changes{$role}{'alttext'}{$img} = 1; |
|
} |
} |
} |
} |
} |
} |
} |
Line 6300 sub default_change_checker {
|
Line 10333 sub default_change_checker {
|
if ($confhash->{$role}{'showlogo'}{$img} == 0) { |
if ($confhash->{$role}{'showlogo'}{$img} == 0) { |
$changes->{$role}{'showlogo'}{$img} = 1; |
$changes->{$role}{'showlogo'}{$img} = 1; |
} |
} |
|
if (ref($confhash->{$role}{'alttext'}) eq 'HASH') { |
|
if ($confhash->{$role}{'alttext'}{$img} ne '') { |
|
$changes->{$role}{'alttext'}{$img} = 1; |
|
} |
|
} |
} |
} |
} |
} |
if ($confhash->{$role}{'font'}) { |
if ($confhash->{$role}{'font'}) { |
Line 6338 sub display_colorchgs {
|
Line 10376 sub display_colorchgs {
|
} else { |
} else { |
$resulttext .= '<li>'.&mt("$choices{$item} set to not be displayed").'</li>'; |
$resulttext .= '<li>'.&mt("$choices{$item} set to not be displayed").'</li>'; |
} |
} |
|
} elsif (($role eq 'login') && ($key eq 'alttext')) { |
|
if ($confhash->{$role}{$key}{$item} ne '') { |
|
$resulttext .= '<li>'.&mt("$choices{$key} for $choices{$item} set to [_1].", |
|
$confhash->{$role}{$key}{$item}).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt("$choices{$key} for $choices{$item} deleted.").'</li>'; |
|
} |
} elsif ($confhash->{$role}{$item} eq '') { |
} elsif ($confhash->{$role}{$item} eq '') { |
$resulttext .= '<li>'.&mt("$choices{$item} set to default").'</li>'; |
$resulttext .= '<li>'.&mt("$choices{$item} set to default").'</li>'; |
} else { |
} else { |
Line 6396 sub check_configuser {
|
Line 10441 sub check_configuser {
|
my ($configuserok,%currroles); |
my ($configuserok,%currroles); |
if ($uhome eq 'no_host') { |
if ($uhome eq 'no_host') { |
srand( time() ^ ($$ + ($$ << 15)) ); # Seed rand. |
srand( time() ^ ($$ + ($$ << 15)) ); # Seed rand. |
my $configpass = &LONCAPA::Enrollment::create_password(); |
my $configpass = &LONCAPA::Enrollment::create_password($dom); |
$configuserok = |
$configuserok = |
&Apache::lonnet::modifyuser($dom,$confname,'','internal', |
&Apache::lonnet::modifyuser($dom,$confname,'','internal', |
$configpass,'','','','','',undef,$servadm); |
$configpass,'','','','','',undef,$servadm); |
Line 6470 sub publishlogo {
|
Line 10515 sub publishlogo {
|
} else { |
} else { |
my $source = $filepath.'/'.$file; |
my $source = $filepath.'/'.$file; |
my $logfile; |
my $logfile; |
if (!open($logfile,">>$source".'.log')) { |
if (!open($logfile,">>",$source.'.log')) { |
return (&mt('No write permission to Authoring Space')); |
return (&mt('No write permission to Authoring Space')); |
} |
} |
print $logfile |
print $logfile |
"\n================= Publish ".localtime()." ================\n". |
"\n================= Publish ".localtime()." ================\n". |
$env{'user.name'}.':'.$env{'user.domain'}."\n"; |
$env{'user.name'}.':'.$env{'user.domain'}."\n"; |
# Save the file |
# Save the file |
if (!open(FH,'>'.$source)) { |
if (!open(FH,">",$source)) { |
&Apache::lonnet::logthis('Failed to create '.$source); |
&Apache::lonnet::logthis('Failed to create '.$source); |
return (&mt('Failed to create file')); |
return (&mt('Failed to create file')); |
} |
} |
Line 6538 $env{'user.name'}.':'.$env{'user.domain'
|
Line 10583 $env{'user.name'}.':'.$env{'user.domain'
|
if ($fullwidth ne '' && $fullheight ne '') { |
if ($fullwidth ne '' && $fullheight ne '') { |
if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) { |
if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) { |
my $thumbsize = $thumbwidth.'x'.$thumbheight; |
my $thumbsize = $thumbwidth.'x'.$thumbheight; |
system("convert -sample $thumbsize $inputfile $outfile"); |
my @args = ('convert','-sample',$thumbsize,$inputfile,$outfile); |
|
system({$args[0]} @args); |
chmod(0660, $filepath.'/tn-'.$file); |
chmod(0660, $filepath.'/tn-'.$file); |
if (-e $outfile) { |
if (-e $outfile) { |
my $copyfile=$targetdir.'/tn-'.$file; |
my $copyfile=$targetdir.'/tn-'.$file; |
Line 6617 sub write_metadata {
|
Line 10663 sub write_metadata {
|
{ |
{ |
print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file; |
print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file; |
my $mfh; |
my $mfh; |
if (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) { |
if (open($mfh,">",$targetdir.'/'.$file.'.meta')) { |
foreach (sort(keys(%metadatafields))) { |
foreach (sort(keys(%metadatafields))) { |
unless ($_=~/\./) { |
unless ($_=~/\./) { |
my $unikey=$_; |
my $unikey=$_; |
Line 6651 sub notifysubscribed {
|
Line 10697 sub notifysubscribed {
|
next unless (ref($targetsource) eq 'ARRAY'); |
next unless (ref($targetsource) eq 'ARRAY'); |
my ($target,$source)=@{$targetsource}; |
my ($target,$source)=@{$targetsource}; |
if ($source ne '') { |
if ($source ne '') { |
if (open(my $logfh,'>>'.$source.'.log')) { |
if (open(my $logfh,">>",$source.'.log')) { |
print $logfh "\nCleanup phase: Notifications\n"; |
print $logfh "\nCleanup phase: Notifications\n"; |
my @subscribed=&subscribed_hosts($target); |
my @subscribed=&subscribed_hosts($target); |
foreach my $subhost (@subscribed) { |
foreach my $subhost (@subscribed) { |
Line 6677 sub notifysubscribed {
|
Line 10723 sub notifysubscribed {
|
sub subscribed_hosts { |
sub subscribed_hosts { |
my ($target) = @_; |
my ($target) = @_; |
my @subscribed; |
my @subscribed; |
if (open(my $fh,"<$target.subscription")) { |
if (open(my $fh,"<","$target.subscription")) { |
while (my $subline=<$fh>) { |
while (my $subline=<$fh>) { |
if ($subline =~ /^($match_lonid):/) { |
if ($subline =~ /^($match_lonid):/) { |
my $host = $1; |
my $host = $1; |
Line 6775 sub modify_quotas {
|
Line 10821 sub modify_quotas {
|
$confhash{'uniquecode'}{$type} = 1; |
$confhash{'uniquecode'}{$type} = 1; |
} |
} |
} |
} |
my ($newbook,@allpos); |
my (%newbook,%allpos); |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
if ($env{'form.addbook'}) { |
foreach my $type ('textbooks','templates') { |
if (($env{'form.addbook_cnum'} =~ /^$match_courseid$/) && |
@{$allpos{$type}} = (); |
($env{'form.addbook_cdom'} =~ /^$match_domain$/)) { |
my $invalid; |
if (&Apache::lonnet::homeserver($env{'form.addbook_cnum'}, |
if ($type eq 'textbooks') { |
$env{'form.addbook_cdom'}) eq 'no_host') { |
$invalid = &mt('Invalid LON-CAPA course for textbook'); |
$errors .= '<li><span class="LC_error">'.&mt('Invalid LON-CAPA course for textbook'). |
} else { |
'</span></li>'; |
$invalid = &mt('Invalid LON-CAPA course for template'); |
} else { |
} |
$newbook = $env{'form.addbook_cdom'}.'_'.$env{'form.addbook_cnum'}; |
if ($env{'form.'.$type.'_addbook'}) { |
my $position = $env{'form.addbook_pos'}; |
if (($env{'form.'.$type.'_addbook_cnum'} =~ /^$match_courseid$/) && |
$position =~ s/\D+//g; |
($env{'form.'.$type.'_addbook_cdom'} =~ /^$match_domain$/)) { |
if ($position ne '') { |
if (&Apache::lonnet::homeserver($env{'form.'.$type.'_addbook_cnum'}, |
$allpos[$position] = $newbook; |
$env{'form.'.$type.'_addbook_cdom'}) eq 'no_host') { |
|
$errors .= '<li><span class="LC_error">'.$invalid.'</span></li>'; |
|
} else { |
|
$newbook{$type} = $env{'form.'.$type.'_addbook_cdom'}.'_'.$env{'form.'.$type.'_addbook_cnum'}; |
|
my $position = $env{'form.'.$type.'_addbook_pos'}; |
|
$position =~ s/\D+//g; |
|
if ($position ne '') { |
|
$allpos{$type}[$position] = $newbook{$type}; |
|
} |
} |
} |
|
} else { |
|
$errors .= '<li><span class="LC_error">'.$invalid.'</span></li>'; |
} |
} |
} else { |
|
$errors .= '<li><span class="LC_error">'.&mt('Invalid LON-CAPA course for textbook'). |
|
'</span></li>'; |
|
} |
} |
} |
} |
|
|
} |
} |
if (ref($domconfig{$action}) eq 'HASH') { |
if (ref($domconfig{$action}) eq 'HASH') { |
if (ref($domconfig{$action}{'notify'}) eq 'HASH') { |
if (ref($domconfig{$action}{'notify'}) eq 'HASH') { |
Line 6830 sub modify_quotas {
|
Line 10882 sub modify_quotas {
|
$changes{'uniquecode'} = 1; |
$changes{'uniquecode'} = 1; |
} |
} |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
if (ref($domconfig{$action}{'textbooks'}) eq 'HASH') { |
foreach my $type ('textbooks','templates') { |
my %deletions; |
if (ref($domconfig{$action}{$type}) eq 'HASH') { |
my @todelete = &Apache::loncommon::get_env_multiple('form.book_del'); |
my %deletions; |
if (@todelete) { |
my @todelete = &Apache::loncommon::get_env_multiple('form.'.$type.'_del'); |
map { $deletions{$_} = 1; } @todelete; |
if (@todelete) { |
} |
map { $deletions{$_} = 1; } @todelete; |
my %imgdeletions; |
} |
my @todeleteimages = &Apache::loncommon::get_env_multiple('form.book_image_del'); |
my %imgdeletions; |
if (@todeleteimages) { |
my @todeleteimages = &Apache::loncommon::get_env_multiple('form.'.$type.'_image_del'); |
map { $imgdeletions{$_} = 1; } @todeleteimages; |
if (@todeleteimages) { |
} |
map { $imgdeletions{$_} = 1; } @todeleteimages; |
my $maxnum = $env{'form.book_maxnum'}; |
} |
for (my $i=0; $i<=$maxnum; $i++) { |
my $maxnum = $env{'form.'.$type.'_maxnum'}; |
my $key = $env{'form.book_id_'.$i}; |
for (my $i=0; $i<=$maxnum; $i++) { |
if (ref($domconfig{$action}{'textbooks'}{$key}) eq 'HASH') { |
my $itemid = $env{'form.'.$type.'_id_'.$i}; |
if ($deletions{$key}) { |
my ($key) = ($itemid =~ /^\Q$type\E_(\w+)$/); |
if ($domconfig{$action}{'textbooks'}{$key}{'image'}) { |
if (ref($domconfig{$action}{$type}{$key}) eq 'HASH') { |
#FIXME need to obsolete item in RES space |
if ($deletions{$key}) { |
|
if ($domconfig{$action}{$type}{$key}{'image'}) { |
|
#FIXME need to obsolete item in RES space |
|
} |
|
next; |
|
} else { |
|
my $newpos = $env{'form.'.$itemid}; |
|
$newpos =~ s/\D+//g; |
|
foreach my $item ('subject','title','publisher','author') { |
|
next if ((($item eq 'author') || ($item eq 'publisher')) && |
|
($type eq 'templates')); |
|
$confhash{$type}{$key}{$item} = $env{'form.'.$type.'_'.$item.'_'.$i}; |
|
if ($domconfig{$action}{$type}{$key}{$item} ne $confhash{$type}{$key}{$item}) { |
|
$changes{$type}{$key} = 1; |
|
} |
|
} |
|
$allpos{$type}[$newpos] = $key; |
} |
} |
next; |
if ($imgdeletions{$key}) { |
} else { |
$changes{$type}{$key} = 1; |
my $newpos = $env{'form.'.$key}; |
#FIXME need to obsolete item in RES space |
$newpos =~ s/\D+//g; |
} elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) { |
foreach my $item ('subject','title','author') { |
my ($cdom,$cnum) = split(/_/,$key); |
$confhash{'textbooks'}{$key}{$item} = $env{'form.book_'.$item.'_'.$i}; |
if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { |
if ($domconfig{$action}{'textbooks'}{$key}{$item} ne $confhash{'textbooks'}{$key}{$item}) { |
$errors .= '<li><span class="LC_error">'.&mt('Image not saved: could not find textbook course').'</li>'; |
$changes{'textbooks'}{$key} = 1; |
} else { |
} |
my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i, |
} |
$cdom,$cnum,$type,$configuserok, |
$allpos[$newpos] = $key; |
$switchserver,$author_ok); |
} |
if ($imgurl) { |
if ($imgdeletions{$key}) { |
$confhash{$type}{$key}{'image'} = $imgurl; |
$changes{'textbooks'}{$key} = 1; |
$changes{$type}{$key} = 1; |
#FIXME need to obsolete item in RES space |
} |
} elsif ($env{'form.book_image_'.$i.'.filename'}) { |
if ($error) { |
my ($cdom,$cnum) = split(/_/,$key); |
&Apache::lonnet::logthis($error); |
my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,'book_image_'.$i, |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
$cdom,$cnum,$configuserok, |
} |
$switchserver,$author_ok); |
} |
if ($imgurl) { |
} elsif ($domconfig{$action}{$type}{$key}{'image'}) { |
$confhash{'textbooks'}{$key}{'image'} = $imgurl; |
$confhash{$type}{$key}{'image'} = |
$changes{'textbooks'}{$key} = 1; |
$domconfig{$action}{$type}{$key}{'image'}; |
} |
} |
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} elsif ($domconfig{$action}{'textbooks'}{$key}{'image'}) { |
|
$confhash{'textbooks'}{$key}{'image'} = |
|
$domconfig{$action}{'textbooks'}{$key}{'image'}; |
|
} |
} |
} |
} |
} |
} |
Line 6894 sub modify_quotas {
|
Line 10955 sub modify_quotas {
|
} |
} |
} |
} |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
if ($newbook) { |
foreach my $type ('textbooks','templates') { |
$changes{'textbooks'}{$newbook} = 1; |
if ($newbook{$type}) { |
foreach my $item ('subject','title','author') { |
$changes{$type}{$newbook{$type}} = 1; |
$env{'form.addbook_'.$item} =~ s/(`)/'/g; |
foreach my $item ('subject','title','publisher','author') { |
if ($env{'form.addbook_'.$item}) { |
next if ((($item eq 'author') || ($item eq 'publisher')) && |
$confhash{'textbooks'}{$newbook}{$item} = $env{'form.addbook_'.$item}; |
($type eq 'template')); |
} |
$env{'form.'.$type.'_addbook_'.$item} =~ s/(`)/'/g; |
} |
if ($env{'form.'.$type.'_addbook_'.$item}) { |
if ($env{'form.addbook_image.filename'} ne '') { |
$confhash{$type}{$newbook{$type}}{$item} = $env{'form.'.$type.'_addbook_'.$item}; |
my ($cdom,$cnum) = split(/_/,$newbook); |
} |
my ($imageurl,$error) = |
} |
&process_textbook_image($r,$dom,$confname,'addbook_image',$cdom,$cnum,$configuserok, |
if ($type eq 'textbooks') { |
$switchserver,$author_ok); |
if ($env{'form.'.$type.'_addbook_image.filename'} ne '') { |
if ($imageurl) { |
my ($cdom,$cnum) = split(/_/,$newbook{$type}); |
$confhash{'textbooks'}{$newbook}{'image'} = $imageurl; |
if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { |
} |
$errors .= '<li><span class="LC_error">'.&mt('Image not saved: could not find textbook course').'</li>'; |
if ($error) { |
} else { |
&Apache::lonnet::logthis($error); |
my ($imageurl,$error) = |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
&process_textbook_image($r,$dom,$confname,$type.'_addbook_image',$cdom,$cnum,$type, |
|
$configuserok,$switchserver,$author_ok); |
|
if ($imageurl) { |
|
$confhash{$type}{$newbook{$type}}{'image'} = $imageurl; |
|
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} |
|
} |
} |
} |
} |
} |
} |
if (@{$allpos{$type}} > 0) { |
if (@allpos > 0) { |
my $idx = 0; |
my $idx = 0; |
foreach my $item (@{$allpos{$type}}) { |
foreach my $item (@allpos) { |
if ($item ne '') { |
if ($item ne '') { |
$confhash{$type}{$item}{'order'} = $idx; |
$confhash{'textbooks'}{$item}{'order'} = $idx; |
if (ref($domconfig{$action}) eq 'HASH') { |
if (ref($domconfig{$action}) eq 'HASH') { |
if (ref($domconfig{$action}{$type}) eq 'HASH') { |
if (ref($domconfig{$action}{'textbooks'}) eq 'HASH') { |
if (ref($domconfig{$action}{$type}{$item}) eq 'HASH') { |
if (ref($domconfig{$action}{'textbooks'}{$item}) eq 'HASH') { |
if ($domconfig{$action}{$type}{$item}{'order'} ne $idx) { |
if ($domconfig{$action}{'textbooks'}{$item}{'order'} ne $idx) { |
$changes{$type}{$item} = 1; |
$changes{'textbooks'}{$item} = 1; |
} |
} |
} |
} |
} |
} |
} |
|
$idx ++; |
} |
} |
$idx ++; |
|
} |
} |
} |
} |
} |
} |
Line 6942 sub modify_quotas {
|
Line 11013 sub modify_quotas {
|
if (@{$confhash{'validation'}{$item}} > 0) { |
if (@{$confhash{'validation'}{$item}} > 0) { |
@{$confhash{'validation'}{$item}} = sort(@{$confhash{'validation'}{$item}}); |
@{$confhash{'validation'}{$item}} = sort(@{$confhash{'validation'}{$item}}); |
} |
} |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
@changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item}, |
if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') { |
$domconfig{'requestcourses'}{'validation'}{$item}); |
@changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item}, |
|
$domconfig{'requestcourses'}{'validation'}{$item}); |
|
} else { |
|
@changed = @{$confhash{'validation'}{$item}}; |
|
} |
} else { |
} else { |
@changed = @{$confhash{'validation'}{$item}}; |
@changed = @{$confhash{'validation'}{$item}}; |
} |
} |
Line 6966 sub modify_quotas {
|
Line 11041 sub modify_quotas {
|
$env{'form.requestcourses_validation_'.$item} =~ s/[\n\r\f]+/\s/gs; |
$env{'form.requestcourses_validation_'.$item} =~ s/[\n\r\f]+/\s/gs; |
} |
} |
} |
} |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}) eq 'HASH') { |
if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
$changes{'validation'}{$item} = $confhash{'validation'}{$item}; |
if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) { |
|
$changes{'validation'}{$item} = $confhash{'validation'}{$item}; |
|
} |
|
} else { |
|
if ($confhash{'validation'}{$item} ne '') { |
|
$changes{'validation'}{$item} = $confhash{'validation'}{$item}; |
|
} |
} |
} |
} else { |
} else { |
if ($confhash{'validation'}{$item} ne '') { |
if ($confhash{'validation'}{$item} ne '') { |
Line 6980 sub modify_quotas {
|
Line 11061 sub modify_quotas {
|
} |
} |
if ($env{'form.validationdc'}) { |
if ($env{'form.validationdc'}) { |
my $newval = $env{'form.validationdc'}; |
my $newval = $env{'form.validationdc'}; |
my %domcoords = &get_active_dcs($dom); |
my %domcoords = &Apache::lonnet::get_active_domroles($dom,['dc']); |
if (exists($domcoords{$newval})) { |
if (exists($domcoords{$newval})) { |
$confhash{'validation'}{'dc'} = $newval; |
$confhash{'validation'}{'dc'} = $newval; |
} |
} |
} |
} |
if (ref($confhash{'validation'}) eq 'HASH') { |
if (ref($confhash{'validation'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}) eq 'HASH') { |
if ($domconfig{'requestcourses'}{'validation'}{'dc'}) { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) { |
if ($domconfig{'requestcourses'}{'validation'}{'dc'}) { |
if ($confhash{'validation'}{'dc'} eq '') { |
unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) { |
$changes{'validation'}{'dc'} = &mt('None'); |
if ($confhash{'validation'}{'dc'} eq '') { |
} else { |
$changes{'validation'}{'dc'} = &mt('None'); |
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
} else { |
|
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
|
} |
} |
} |
|
} elsif ($confhash{'validation'}{'dc'} ne '') { |
|
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
} |
} |
} elsif ($confhash{'validation'}{'dc'} ne '') { |
} elsif ($confhash{'validation'}{'dc'} ne '') { |
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
Line 7001 sub modify_quotas {
|
Line 11086 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'}; |
} |
} |
} elsif (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
} else { |
if ($domconfig{'requestcourses'}{'validation'}{'dc'}) { |
if (ref($domconfig{'requestcourses'}) eq 'HASH') { |
$changes{'validation'}{'dc'} = &mt('None'); |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
|
if ($domconfig{'requestcourses'}{'validation'}{'dc'}) { |
|
$changes{'validation'}{'dc'} = &mt('None'); |
|
} |
|
} |
} |
} |
} |
} |
} |
} |
Line 7147 sub modify_quotas {
|
Line 11236 sub modify_quotas {
|
$domdefaults{'requestauthor'} = \%confhash; |
$domdefaults{'requestauthor'} = \%confhash; |
} else { |
} else { |
foreach my $key (keys(%confhash)) { |
foreach my $key (keys(%confhash)) { |
unless (($context eq 'requestcourses') && ($key eq 'textbooks')) { |
unless (($context eq 'requestcourses') && (($key eq 'textbooks') || ($key eq 'templates'))) { |
$domdefaults{$key} = $confhash{$key}; |
$domdefaults{$key} = $confhash{$key}; |
} |
} |
} |
} |
Line 7299 sub modify_quotas {
|
Line 11388 sub modify_quotas {
|
'</li>'; |
'</li>'; |
} |
} |
} |
} |
if (ref($changes{'textbooks'}) eq 'HASH') { |
foreach my $type ('textbooks','templates') { |
$resulttext .= '<li>'.&mt('Available textbooks updated').'<ul>'; |
if (ref($changes{$type}) eq 'HASH') { |
foreach my $key (sort(keys(%{$changes{'textbooks'}}))) { |
$resulttext .= '<li>'.&mt("Available $type updated").'<ul>'; |
my %coursehash = &Apache::lonnet::coursedescription($key); |
foreach my $key (sort(keys(%{$changes{$type}}))) { |
my $coursetitle = $coursehash{'description'}; |
my %coursehash = &Apache::lonnet::coursedescription($key); |
my $position = $confhash{'textbooks'}{$key}{'order'} + 1; |
my $coursetitle = $coursehash{'description'}; |
$resulttext .= '<li>'; |
my $position = $confhash{$type}{$key}{'order'} + 1; |
foreach my $item ('subject','title','author') { |
$resulttext .= '<li>'; |
my $name = $item.':'; |
foreach my $item ('subject','title','publisher','author') { |
$name =~ s/^(\w)/\U$1/; |
next if ((($item eq 'author') || ($item eq 'publisher')) && |
$resulttext .= &mt($name).' '.$confhash{'textbooks'}{$key}{$item}.'<br />'; |
($type eq 'templates')); |
} |
my $name = $item.':'; |
$resulttext .= ' '.&mt('Order: [_1]',$position).'<br />'; |
$name =~ s/^(\w)/\U$1/; |
if ($confhash{'textbooks'}{$key}{'image'}) { |
$resulttext .= &mt($name).' '.$confhash{$type}{$key}{$item}.'<br />'; |
$resulttext .= ' '.&mt('Image: [_1]', |
} |
'<img src="'.$confhash{'textbooks'}{$key}{'image'}.'"'. |
$resulttext .= ' '.&mt('Order: [_1]',$position).'<br />'; |
' alt="Textbook cover" />').'<br />'; |
if ($type eq 'textbooks') { |
|
if ($confhash{$type}{$key}{'image'}) { |
|
$resulttext .= ' '.&mt('Image: [_1]', |
|
'<img src="'.$confhash{$type}{$key}{'image'}.'"'. |
|
' alt="Textbook cover" />').'<br />'; |
|
} |
|
} |
|
$resulttext .= ' '.&mt('LON-CAPA Course: [_1]',$coursetitle).'</li>'; |
} |
} |
$resulttext .= ' '.&mt('LON-CAPA Course: [_1]',$coursetitle).'</li>'; |
$resulttext .= '</ul></li>'; |
} |
} |
$resulttext .= '</ul></li>'; |
|
} |
} |
if (ref($changes{'validation'}) eq 'HASH') { |
if (ref($changes{'validation'}) eq 'HASH') { |
if ((ref($validationitemsref) eq 'ARRAY') && (ref($validationnamesref) eq 'HASH')) { |
if ((ref($validationitemsref) eq 'ARRAY') && (ref($validationnamesref) eq 'HASH')) { |
Line 7367 sub modify_quotas {
|
Line 11462 sub modify_quotas {
|
} |
} |
|
|
sub process_textbook_image { |
sub process_textbook_image { |
my ($r,$dom,$confname,$caller,$cdom,$cnum,$configuserok,$switchserver,$author_ok) = @_; |
my ($r,$dom,$confname,$caller,$cdom,$cnum,$type,$configuserok,$switchserver,$author_ok) = @_; |
my $filename = $env{'form.'.$caller.'.filename'}; |
my $filename = $env{'form.'.$caller.'.filename'}; |
my ($error,$url); |
my ($error,$url); |
my ($width,$height) = (50,50); |
my ($width,$height) = (50,50); |
Line 7378 sub process_textbook_image {
|
Line 11473 sub process_textbook_image {
|
} elsif ($author_ok eq 'ok') { |
} elsif ($author_ok eq 'ok') { |
my ($result,$imageurl) = |
my ($result,$imageurl) = |
&publishlogo($r,'upload',$caller,$dom,$confname, |
&publishlogo($r,'upload',$caller,$dom,$confname, |
"textbooks/$dom/$cnum/cover",$width,$height); |
"$type/$cdom/$cnum/cover",$width,$height); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$url = $imageurl; |
$url = $imageurl; |
} else { |
} else { |
Line 7405 sub modify_autoenroll {
|
Line 11500 sub modify_autoenroll {
|
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my %title = ( run => 'Auto-enrollment active', |
my %title = ( run => 'Auto-enrollment active', |
sender => 'Sender for notification messages', |
sender => 'Sender for notification messages', |
coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)'); |
coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)', |
|
autofailsafe => 'Failsafe for no drops if institutional data missing for a section'); |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
my $sender_uname = $env{'form.sender_uname'}; |
my $sender_uname = $env{'form.sender_uname'}; |
my $sender_domain = $env{'form.sender_domain'}; |
my $sender_domain = $env{'form.sender_domain'}; |
Line 7415 sub modify_autoenroll {
|
Line 11511 sub modify_autoenroll {
|
$sender_domain = ''; |
$sender_domain = ''; |
} |
} |
my $coowners = $env{'form.autoassign_coowners'}; |
my $coowners = $env{'form.autoassign_coowners'}; |
|
my $autofailsafe = $env{'form.autoenroll_autofailsafe'}; |
|
$autofailsafe =~ s{^\s+|\s+$}{}g; |
|
if ($autofailsafe =~ /\D/) { |
|
undef($autofailsafe); |
|
} |
|
my $failsafe = $env{'form.autoenroll_failsafe'}; |
|
unless (($failsafe eq 'zero') || ($failsafe eq 'any')) { |
|
$failsafe = 'off'; |
|
undef($autofailsafe); |
|
} |
my %autoenrollhash = ( |
my %autoenrollhash = ( |
autoenroll => { 'run' => $env{'form.autoenroll_run'}, |
autoenroll => { 'run' => $env{'form.autoenroll_run'}, |
'sender_uname' => $sender_uname, |
'sender_uname' => $sender_uname, |
'sender_domain' => $sender_domain, |
'sender_domain' => $sender_domain, |
'co-owners' => $coowners, |
'co-owners' => $coowners, |
|
'autofailsafe' => $autofailsafe, |
|
'failsafe' => $failsafe, |
} |
} |
); |
); |
my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash, |
Line 7446 sub modify_autoenroll {
|
Line 11554 sub modify_autoenroll {
|
} |
} |
} elsif ($coowners) { |
} elsif ($coowners) { |
$changes{'coowners'} = 1; |
$changes{'coowners'} = 1; |
} |
} |
|
if ($currautoenroll{'autofailsafe'} ne $autofailsafe) { |
|
$changes{'autofailsafe'} = 1; |
|
} |
|
if ($currautoenroll{'failsafe'} ne $failsafe) { |
|
$changes{'failsafe'} = 1; |
|
} |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
if ($changes{'run'}) { |
if ($changes{'run'}) { |
Line 7466 sub modify_autoenroll {
|
Line 11580 sub modify_autoenroll {
|
$lastactref->{'domainconfig'} = 1; |
$lastactref->{'domainconfig'} = 1; |
} |
} |
} |
} |
|
if ($changes{'autofailsafe'}) { |
|
if ($autofailsafe ne '') { |
|
$resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section set to: [_1]',$autofailsafe).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section not in use').'</li>'; |
|
} |
|
} |
|
if ($changes{'failsafe'}) { |
|
if ($failsafe eq 'off') { |
|
unless ($changes{'autofailsafe'}) { |
|
$resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section not in use').'</li>'; |
|
} |
|
} elsif ($failsafe eq 'zero') { |
|
$resulttext .= '<li>'.&mt('Failsafe applies if retrieved section enrollment is zero').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Failsafe applies if retrieved section enrollment is zero or greater').'</li>'; |
|
} |
|
} |
|
if (($changes{'autofailsafe'}) || ($changes{'failsafe'})) { |
|
&Apache::lonnet::get_domain_defaults($dom,1); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
|
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
$resulttext = &mt('No changes made to auto-enrollment settings'); |
$resulttext = &mt('No changes made to auto-enrollment settings'); |
Line 7487 sub modify_autoupdate {
|
Line 11625 sub modify_autoupdate {
|
} |
} |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
my %title = &Apache::lonlocal::texthash ( |
my %title = &Apache::lonlocal::texthash ( |
run => 'Auto-update:', |
run => 'Auto-update:', |
classlists => 'Updates to user information in classlists?' |
classlists => 'Updates to user information in classlists?', |
|
unexpired => 'Skip updates for users without active or future roles?', |
|
lastactive => 'Skip updates for inactive users?', |
); |
); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my %fieldtitles = &Apache::lonlocal::texthash ( |
my %fieldtitles = &Apache::lonlocal::texthash ( |
Line 7532 sub modify_autoupdate {
|
Line 11672 sub modify_autoupdate {
|
my %updatehash = ( |
my %updatehash = ( |
autoupdate => { run => $env{'form.autoupdate_run'}, |
autoupdate => { run => $env{'form.autoupdate_run'}, |
classlists => $env{'form.classlists'}, |
classlists => $env{'form.classlists'}, |
|
unexpired => $env{'form.unexpired'}, |
fields => {%fields}, |
fields => {%fields}, |
lockablenames => \@lockablenames, |
lockablenames => \@lockablenames, |
} |
} |
); |
); |
|
my $lastactivedays; |
|
if ($env{'form.lastactive'}) { |
|
$lastactivedays = $env{'form.lastactivedays'}; |
|
$lastactivedays =~ s/^\s+|\s+$//g; |
|
unless ($lastactivedays =~ /^\d+$/) { |
|
undef($lastactivedays); |
|
$env{'form.lastactive'} = 0; |
|
} |
|
} |
|
$updatehash{'autoupdate'}{'lastactive'} = $lastactivedays; |
foreach my $key (keys(%currautoupdate)) { |
foreach my $key (keys(%currautoupdate)) { |
if (($key eq 'run') || ($key eq 'classlists')) { |
if (($key eq 'run') || ($key eq 'classlists') || ($key eq 'unexpired') || ($key eq 'lastactive')) { |
if (exists($updatehash{autoupdate}{$key})) { |
if (exists($updatehash{autoupdate}{$key})) { |
if ($currautoupdate{$key} ne $updatehash{autoupdate}{$key}) { |
if ($currautoupdate{$key} ne $updatehash{autoupdate}{$key}) { |
$changes{$key} = 1; |
$changes{$key} = 1; |
Line 7583 sub modify_autoupdate {
|
Line 11734 sub modify_autoupdate {
|
$changes{'lockablenames'} = 1; |
$changes{'lockablenames'} = 1; |
} |
} |
} |
} |
|
unless (grep(/^unexpired$/,keys(%currautoupdate))) { |
|
if ($updatehash{'autoupdate'}{'unexpired'}) { |
|
$changes{'unexpired'} = 1; |
|
} |
|
} |
|
unless (grep(/^lastactive$/,keys(%currautoupdate))) { |
|
if ($updatehash{'autoupdate'}{'lastactive'} ne '') { |
|
$changes{'lastactive'} = 1; |
|
} |
|
} |
foreach my $item (@{$types},'default') { |
foreach my $item (@{$types},'default') { |
if (defined($fields{$item})) { |
if (defined($fields{$item})) { |
if (ref($currautoupdate{'fields'}) eq 'HASH') { |
if (ref($currautoupdate{'fields'}) eq 'HASH') { |
Line 7645 sub modify_autoupdate {
|
Line 11806 sub modify_autoupdate {
|
my $newvalue; |
my $newvalue; |
if ($key eq 'run') { |
if ($key eq 'run') { |
$newvalue = $offon[$env{'form.autoupdate_run'}]; |
$newvalue = $offon[$env{'form.autoupdate_run'}]; |
|
} elsif ($key eq 'lastactive') { |
|
$newvalue = $offon[$env{'form.lastactive'}]; |
|
unless ($lastactivedays eq '') { |
|
$newvalue .= '; '.&mt('inactive = no activity in last [quant,_1,day]',$lastactivedays); |
|
} |
} else { |
} else { |
$newvalue = $offon[$env{'form.'.$key}]; |
$newvalue = $offon[$env{'form.'.$key}]; |
} |
} |
Line 7681 sub modify_autocreate {
|
Line 11847 sub modify_autocreate {
|
$newvals{$item} = 0 if ($newvals{$item} eq ''); |
$newvals{$item} = 0 if ($newvals{$item} eq ''); |
} |
} |
$newvals{'xmldc'} = $env{'form.autocreate_xmldc'}; |
$newvals{'xmldc'} = $env{'form.autocreate_xmldc'}; |
my %domcoords = &get_active_dcs($dom); |
my %domcoords = &Apache::lonnet::get_active_domroles($dom,['dc']); |
unless (exists($domcoords{$newvals{'xmldc'}})) { |
unless (exists($domcoords{$newvals{'xmldc'}})) { |
$newvals{'xmldc'} = ''; |
$newvals{'xmldc'} = ''; |
} |
} |
Line 7738 sub modify_autocreate {
|
Line 11904 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 7746 sub modify_directorysrch {
|
Line 11912 sub modify_directorysrch {
|
$currdirsrch{$key} = $domconfig{'directorysrch'}{$key}; |
$currdirsrch{$key} = $domconfig{'directorysrch'}{$key}; |
} |
} |
} |
} |
my %title = ( available => 'Directory search available', |
my %title = ( available => 'Institutional directory search available', |
localonly => 'Other domains can search', |
localonly => 'Other domains can search institution', |
|
lcavailable => 'LON-CAPA directory search available', |
|
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 7821 sub modify_directorysrch {
|
Line 11989 sub modify_directorysrch {
|
my %dirsrch_hash = ( |
my %dirsrch_hash = ( |
directorysrch => { available => $env{'form.dirsrch_available'}, |
directorysrch => { available => $env{'form.dirsrch_available'}, |
cansearch => \@cansearch, |
cansearch => \@cansearch, |
localonly => $env{'form.dirsrch_localonly'}, |
localonly => $env{'form.dirsrch_instlocalonly'}, |
|
lclocalonly => $env{'form.dirsrch_domlocalonly'}, |
|
lcavailable => $env{'form.dirsrch_domavailable'}, |
searchby => \@searchby, |
searchby => \@searchby, |
searchtypes => \@searchtypes, |
searchtypes => \@searchtypes, |
} |
} |
Line 7838 sub modify_directorysrch {
|
Line 12008 sub modify_directorysrch {
|
$changes{'available'} = 1; |
$changes{'available'} = 1; |
} |
} |
} |
} |
|
if (exists($currdirsrch{'lcavailable'})) { |
|
if ($currdirsrch{'lcavailable'} ne $env{'form.dirsrch_domavailable'}) { |
|
$changes{'lcavailable'} = 1; |
|
} |
|
} else { |
|
if ($env{'form.dirsrch_lcavailable'} eq '1') { |
|
$changes{'lcavailable'} = 1; |
|
} |
|
} |
if (exists($currdirsrch{'localonly'})) { |
if (exists($currdirsrch{'localonly'})) { |
if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_localonly'}) { |
if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_instlocalonly'}) { |
$changes{'localonly'} = 1; |
$changes{'localonly'} = 1; |
} |
} |
} else { |
} else { |
if ($env{'form.dirsrch_localonly'} eq '1') { |
if ($env{'form.dirsrch_instlocalonly'} eq '1') { |
$changes{'localonly'} = 1; |
$changes{'localonly'} = 1; |
} |
} |
} |
} |
|
if (exists($currdirsrch{'lclocalonly'})) { |
|
if ($currdirsrch{'lclocalonly'} ne $env{'form.dirsrch_domlocalonly'}) { |
|
$changes{'lclocalonly'} = 1; |
|
} |
|
} else { |
|
if ($env{'form.dirsrch_domlocalonly'} eq '1') { |
|
$changes{'lclocalonly'} = 1; |
|
} |
|
} |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
if ($changes{'available'}) { |
if ($changes{'available'}) { |
$resulttext .= '<li>'.&mt("$title{'available'} set to: $offon[$env{'form.dirsrch_available'}]").'</li>'; |
$resulttext .= '<li>'.&mt("$title{'available'} set to: $offon[$env{'form.dirsrch_available'}]").'</li>'; |
} |
} |
|
if ($changes{'lcavailable'}) { |
|
$resulttext .= '<li>'.&mt("$title{'lcavailable'} set to: $offon[$env{'form.dirsrch_domavailable'}]").'</li>'; |
|
} |
if ($changes{'localonly'}) { |
if ($changes{'localonly'}) { |
$resulttext .= '<li>'.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_localonly'}]").'</li>'; |
$resulttext .= '<li>'.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_instlocalonly'}]").'</li>'; |
|
} |
|
if ($changes{'lclocalonly'}) { |
|
$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 7905 sub modify_directorysrch {
|
Line 12098 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 institution directory search settings'); |
$resulttext = &mt('No changes made to directory search settings'); |
} |
} |
} else { |
} else { |
$resulttext = '<span class="LC_error">'. |
$resulttext = '<span class="LC_error">'. |
Line 7923 sub modify_contacts {
|
Line 12120 sub modify_contacts {
|
$currsetting{$key} = $domconfig{'contacts'}{$key}; |
$currsetting{$key} = $domconfig{'contacts'}{$key}; |
} |
} |
} |
} |
my (%others,%to,%bcc); |
my (%others,%to,%bcc,%includestr,%includeloc); |
my @contacts = ('supportemail','adminemail'); |
my @contacts = ('supportemail','adminemail'); |
my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail', |
my @mailings = ('errormail','packagesmail','helpdeskmail','otherdomsmail', |
'requestsmail','updatesmail','idconflictsmail'); |
'lonstatusmail','requestsmail','updatesmail','idconflictsmail','hostipmail'); |
my @toggles = ('reporterrors','reportupdates'); |
my @toggles = ('reporterrors','reportupdates','reportstatus'); |
|
my @lonstatus = ('threshold','sysmail','weights','excluded'); |
|
my ($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields(); |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
@{$newsetting{$type}} = |
@{$newsetting{$type}} = |
&Apache::loncommon::get_env_multiple('form.'.$type); |
&Apache::loncommon::get_env_multiple('form.'.$type); |
Line 7937 sub modify_contacts {
|
Line 12136 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') { |
if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) { |
$bcc{$type} = $env{'form.'.$type.'_bcc'}; |
$bcc{$type} = $env{'form.'.$type.'_bcc'}; |
$contacts_hash{contacts}{$type}{'bcc'} = $bcc{$type}; |
$contacts_hash{contacts}{$type}{'bcc'} = $bcc{$type}; |
|
if (($env{'form.'.$type.'_includestr'} ne '') && ($env{'form.'.$type.'_includeloc'} =~ /^s|b$/)) { |
|
$includestr{$type} = $env{'form.'.$type.'_includestr'}; |
|
$includeloc{$type} = $env{'form.'.$type.'_includeloc'}; |
|
$contacts_hash{contacts}{$type}{'include'} = $includeloc{$type}.':'.&escape($includestr{$type}); |
|
} |
} |
} |
} |
} |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
Line 7954 sub modify_contacts {
|
Line 12158 sub modify_contacts {
|
$contacts_hash{'contacts'}{$item} = $env{'form.'.$item}; |
$contacts_hash{'contacts'}{$item} = $env{'form.'.$item}; |
} |
} |
} |
} |
|
my ($lonstatus_defs,$lonstatus_names) = &Apache::loncommon::lon_status_items(); |
|
foreach my $item (@lonstatus) { |
|
if ($item eq 'excluded') { |
|
my (%serverhomes,@excluded); |
|
map { $serverhomes{$_} = 1; } values(%Apache::lonnet::serverhomeIDs); |
|
my @possexcluded = &Apache::loncommon::get_env_multiple('form.errorexcluded'); |
|
if (@possexcluded) { |
|
foreach my $id (sort(@possexcluded)) { |
|
if ($serverhomes{$id}) { |
|
push(@excluded,$id); |
|
} |
|
} |
|
} |
|
if (@excluded) { |
|
$contacts_hash{'contacts'}{'lonstatus'}{$item} = \@excluded; |
|
} |
|
} elsif ($item eq 'weights') { |
|
foreach my $type ('E','W','N','U') { |
|
$env{'form.error'.$item.'_'.$type} =~ s/^\s+|\s+$//g; |
|
if ($env{'form.error'.$item.'_'.$type} =~ /^\d+$/) { |
|
unless ($env{'form.error'.$item.'_'.$type} == $lonstatus_defs->{$type}) { |
|
$contacts_hash{'contacts'}{'lonstatus'}{$item}{$type} = |
|
$env{'form.error'.$item.'_'.$type}; |
|
} |
|
} |
|
} |
|
} elsif (($item eq 'threshold') || ($item eq 'sysmail')) { |
|
$env{'form.error'.$item} =~ s/^\s+|\s+$//g; |
|
if ($env{'form.error'.$item} =~ /^\d+$/) { |
|
unless ($env{'form.error'.$item} == $lonstatus_defs->{$item}) { |
|
$contacts_hash{'contacts'}{'lonstatus'}{$item} = $env{'form.error'.$item}; |
|
} |
|
} |
|
} |
|
} |
|
if ((ref($fields) eq 'ARRAY') && (ref($possoptions) eq 'HASH')) { |
|
foreach my $field (@{$fields}) { |
|
if (ref($possoptions->{$field}) eq 'ARRAY') { |
|
my $value = $env{'form.helpform_'.$field}; |
|
$value =~ s/^\s+|\s+$//g; |
|
if (grep(/^\Q$value\E$/,@{$possoptions->{$field}})) { |
|
$contacts_hash{'contacts'}{'helpform'}{$field} = $value; |
|
if ($field eq 'screenshot') { |
|
$env{'form.helpform_maxsize'} =~ s/^\s+|\s+$//g; |
|
if ($env{'form.helpform_maxsize'} =~ /^\d+\.?\d*$/) { |
|
$contacts_hash{'contacts'}{'helpform'}{'maxsize'} = $env{'form.helpform_maxsize'}; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
my (@statuses,%usertypeshash,@overrides); |
|
if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) { |
|
@statuses = @{$types}; |
|
if (ref($usertypes) eq 'HASH') { |
|
%usertypeshash = %{$usertypes}; |
|
} |
|
} |
|
if (@statuses) { |
|
my @possoverrides = &Apache::loncommon::get_env_multiple('form.overrides'); |
|
foreach my $type (@possoverrides) { |
|
if (($type ne '') && (grep(/^\Q$type\E$/,@statuses))) { |
|
push(@overrides,$type); |
|
} |
|
} |
|
if (@overrides) { |
|
foreach my $type (@overrides) { |
|
my @standard = &Apache::loncommon::get_env_multiple('form.override_'.$type); |
|
foreach my $item (@contacts) { |
|
if (grep(/^\Q$item\E$/,@standard)) { |
|
$contacts_hash{'contacts'}{'overrides'}{$type}{$item} = 1; |
|
$newsetting{'override_'.$type}{$item} = 1; |
|
} else { |
|
$contacts_hash{'contacts'}{'overrides'}{$type}{$item} = 0; |
|
$newsetting{'override_'.$type}{$item} = 0; |
|
} |
|
} |
|
$contacts_hash{'contacts'}{'overrides'}{$type}{'others'} = $env{'form.override_'.$type.'_others'}; |
|
$contacts_hash{'contacts'}{'overrides'}{$type}{'bcc'} = $env{'form.override_'.$type.'_bcc'}; |
|
$newsetting{'override_'.$type}{'others'} = $env{'form.override_'.$type.'_others'}; |
|
$newsetting{'override_'.$type}{'bcc'} = $env{'form.override_'.$type.'_bcc'}; |
|
if (($env{'form.override_'.$type.'_includestr'} ne '') && ($env{'form.override_'.$type.'_includeloc'} =~ /^s|b$/)) { |
|
$includestr{$type} = $env{'form.override_'.$type.'_includestr'}; |
|
$includeloc{$type} = $env{'form.override_'.$type.'_includeloc'}; |
|
$contacts_hash{'contacts'}{'overrides'}{$type}{'include'} = $includeloc{$type}.':'.&escape($includestr{$type}); |
|
$newsetting{'override_'.$type}{'include'} = $contacts_hash{'contacts'}{'overrides'}{$type}{'include'}; |
|
} |
|
} |
|
} |
|
} |
if (keys(%currsetting) > 0) { |
if (keys(%currsetting) > 0) { |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
if ($to{$item} ne $currsetting{$item}) { |
if ($to{$item} ne $currsetting{$item}) { |
Line 7973 sub modify_contacts {
|
Line 12269 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') { |
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'); |
} |
} |
|
my ($currloc,$currstr) = split(/:/,$currsetting{$type}{'include'},2); |
|
if (($includeloc{$type} ne $currloc) || (&escape($includestr{$type}) ne $currstr)) { |
|
push(@{$changes{$type}},'include'); |
|
} |
|
} |
|
} |
|
if (ref($fields) eq 'ARRAY') { |
|
if (ref($currsetting{'helpform'}) eq 'HASH') { |
|
foreach my $field (@{$fields}) { |
|
if ($currsetting{'helpform'}{$field} ne $contacts_hash{'contacts'}{'helpform'}{$field}) { |
|
push(@{$changes{'helpform'}},$field); |
|
} |
|
if (($field eq 'screenshot') && ($contacts_hash{'contacts'}{'helpform'}{'screenshot'} ne 'no')) { |
|
if ($currsetting{'helpform'}{'maxsize'} ne $contacts_hash{'contacts'}{'helpform'}{'maxsize'}) { |
|
push(@{$changes{'helpform'}},'maxsize'); |
|
} |
|
} |
|
} |
|
} else { |
|
foreach my $field (@{$fields}) { |
|
if ($contacts_hash{'contacts'}{'helpform'}{$field} ne 'yes') { |
|
push(@{$changes{'helpform'}},$field); |
|
} |
|
if (($field eq 'screenshot') && ($contacts_hash{'contacts'}{'helpform'}{'screenshot'} ne 'no')) { |
|
if ($contacts_hash{'contacts'}{'helpform'}{'maxsize'} != 1) { |
|
push(@{$changes{'helpform'}},'maxsize'); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
if (@statuses) { |
|
if (ref($currsetting{'overrides'}) eq 'HASH') { |
|
foreach my $key (keys(%{$currsetting{'overrides'}})) { |
|
if (ref($currsetting{'overrides'}{$key}) eq 'HASH') { |
|
if (ref($newsetting{'override_'.$key}) eq 'HASH') { |
|
foreach my $item (@contacts,'bcc','others','include') { |
|
if ($currsetting{'overrides'}{$key}{$item} ne $newsetting{'override_'.$key}{$item}) { |
|
push(@{$changes{'overrides'}},$key); |
|
last; |
|
} |
|
} |
|
} else { |
|
push(@{$changes{'overrides'}},$key); |
|
} |
|
} |
|
} |
|
foreach my $key (@overrides) { |
|
unless (exists($currsetting{'overrides'}{$key})) { |
|
push(@{$changes{'overrides'}},$key); |
|
} |
|
} |
|
} else { |
|
foreach my $key (@overrides) { |
|
push(@{$changes{'overrides'}},$key); |
|
} |
|
} |
|
} |
|
if (ref($currsetting{'lonstatus'}) eq 'HASH') { |
|
foreach my $key ('excluded','weights','threshold','sysmail') { |
|
if ($key eq 'excluded') { |
|
if ((ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') && |
|
(ref($contacts_hash{contacts}{lonstatus}{excluded}) eq 'ARRAY')) { |
|
if ((ref($currsetting{'lonstatus'}{$key}) eq 'ARRAY') && |
|
(@{$currsetting{'lonstatus'}{$key}})) { |
|
my @diffs = |
|
&Apache::loncommon::compare_arrays($contacts_hash{contacts}{lonstatus}{excluded}, |
|
$currsetting{'lonstatus'}{$key}); |
|
if (@diffs) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
|
} elsif (@{$contacts_hash{contacts}{lonstatus}{excluded}}) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
|
} elsif ((ref($currsetting{'lonstatus'}{$key}) eq 'ARRAY') && |
|
(@{$currsetting{'lonstatus'}{$key}})) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
|
} elsif ($key eq 'weights') { |
|
if ((ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') && |
|
(ref($contacts_hash{contacts}{lonstatus}{$key}) eq 'HASH')) { |
|
if (ref($currsetting{'lonstatus'}{$key}) eq 'HASH') { |
|
foreach my $type ('E','W','N','U') { |
|
unless ($contacts_hash{contacts}{lonstatus}{$key}{$type} eq |
|
$currsetting{'lonstatus'}{$key}{$type}) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
last; |
|
} |
|
} |
|
} else { |
|
foreach my $type ('E','W','N','U') { |
|
if ($contacts_hash{contacts}{lonstatus}{$key}{$type} ne '') { |
|
push(@{$changes{'lonstatus'}},$key); |
|
last; |
|
} |
|
} |
|
} |
|
} elsif (ref($currsetting{'lonstatus'}{$key}) eq 'HASH') { |
|
foreach my $type ('E','W','N','U') { |
|
if ($currsetting{'lonstatus'}{$key}{$type} ne '') { |
|
push(@{$changes{'lonstatus'}},$key); |
|
last; |
|
} |
|
} |
|
} |
|
} elsif (($key eq 'threshold') || ($key eq 'sysmail')) { |
|
if (ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') { |
|
if ($currsetting{'lonstatus'}{$key} =~ /^\d+$/) { |
|
if ($currsetting{'lonstatus'}{$key} != $contacts_hash{contacts}{lonstatus}{$key}) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
|
} elsif ($contacts_hash{contacts}{lonstatus}{$key} =~ /^\d+$/) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
|
} elsif ($currsetting{'lonstatus'}{$key} =~ /^\d+$/) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
|
} |
|
} |
|
} else { |
|
if (ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') { |
|
foreach my $key ('excluded','weights','threshold','sysmail') { |
|
if (exists($contacts_hash{contacts}{lonstatus}{$key})) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
|
} |
} |
} |
} |
} |
} else { |
} else { |
Line 7986 sub modify_contacts {
|
Line 12408 sub modify_contacts {
|
$default{'errormail'} = 'adminemail'; |
$default{'errormail'} = 'adminemail'; |
$default{'packagesmail'} = 'adminemail'; |
$default{'packagesmail'} = 'adminemail'; |
$default{'helpdeskmail'} = 'supportemail'; |
$default{'helpdeskmail'} = 'supportemail'; |
|
$default{'otherdomsmail'} = 'supportemail'; |
$default{'lonstatusmail'} = 'adminemail'; |
$default{'lonstatusmail'} = 'adminemail'; |
$default{'requestsmail'} = 'adminemail'; |
$default{'requestsmail'} = 'adminemail'; |
$default{'updatesmail'} = 'adminemail'; |
$default{'updatesmail'} = 'adminemail'; |
|
$default{'hostipmail'} = 'adminemail'; |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
if ($to{$item} ne $default{$item}) { |
if ($to{$item} ne $default{$item}) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
} |
} |
} |
} |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
if ((@{$newsetting{$type}} != 1) || ($newsetting{$type}[0] ne $default{$type})) { |
if ((@{$newsetting{$type}} != 1) || ($newsetting{$type}[0] ne $default{$type})) { |
|
|
push(@{$changes{$type}},@{$newsetting{$type}}); |
push(@{$changes{$type}},@{$newsetting{$type}}); |
} |
} |
if ($others{$type} ne '') { |
if ($others{$type} ne '') { |
push(@{$changes{$type}},'others'); |
push(@{$changes{$type}},'others'); |
} |
} |
if ($type eq 'helpdeskmail') { |
if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) { |
if ($bcc{$type} ne '') { |
if ($bcc{$type} ne '') { |
push(@{$changes{$type}},'bcc'); |
push(@{$changes{$type}},'bcc'); |
} |
} |
|
if (($includeloc{$type} =~ /^b|s$/) && ($includestr{$type} ne '')) { |
|
push(@{$changes{$type}},'include'); |
|
} |
|
} |
|
} |
|
if (ref($fields) eq 'ARRAY') { |
|
foreach my $field (@{$fields}) { |
|
if ($contacts_hash{'contacts'}{'helpform'}{$field} ne 'yes') { |
|
push(@{$changes{'helpform'}},$field); |
|
} |
|
if (($field eq 'screenshot') && ($contacts_hash{'contacts'}{'helpform'}{'screenshot'} ne 'no')) { |
|
if ($contacts_hash{'contacts'}{'helpform'}{'maxsize'} != 1) { |
|
push(@{$changes{'helpform'}},'maxsize'); |
|
} |
|
} |
|
} |
|
} |
|
if (ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') { |
|
foreach my $key ('excluded','weights','threshold','sysmail') { |
|
if (exists($contacts_hash{contacts}{lonstatus}{$key})) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
} |
} |
} |
} |
} |
} |
Line 8037 sub modify_contacts {
|
Line 12482 sub modify_contacts {
|
} |
} |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
if (ref($changes{$type}) eq 'ARRAY') { |
if (ref($changes{$type}) eq 'ARRAY') { |
$resulttext .= '<li>'.$titles->{$type}.': '; |
if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) { |
|
$resulttext .= '<li>'.$titles->{$type}.' -- '.&mt('sent to').': '; |
|
} else { |
|
$resulttext .= '<li>'.$titles->{$type}.': '; |
|
} |
my @text; |
my @text; |
foreach my $item (@{$newsetting{$type}}) { |
foreach my $item (@{$newsetting{$type}}) { |
push(@text,$short_titles->{$item}); |
push(@text,$short_titles->{$item}); |
Line 8045 sub modify_contacts {
|
Line 12494 sub modify_contacts {
|
if ($others{$type} ne '') { |
if ($others{$type} ne '') { |
push(@text,$others{$type}); |
push(@text,$others{$type}); |
} |
} |
$resulttext .= '<span class="LC_cusr_emph">'. |
if (@text) { |
join(', ',@text).'</span>'; |
$resulttext .= '<span class="LC_cusr_emph">'. |
if ($type eq 'helpdeskmail') { |
join(', ',@text).'</span>'; |
|
} |
|
if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) { |
if ($bcc{$type} ne '') { |
if ($bcc{$type} ne '') { |
$resulttext .= ' '.&mt('with Bcc to').': <span class="LC_cusr_emph">'.$bcc{$type}.'</span>'; |
my $bcctext; |
|
if (@text) { |
|
$bcctext = ' '.&mt('with Bcc to'); |
|
} else { |
|
$bcctext = '(Bcc)'; |
|
} |
|
$resulttext .= $bcctext.': <span class="LC_cusr_emph">'.$bcc{$type}.'</span>'; |
|
} elsif (!@text) { |
|
$resulttext .= &mt('No one'); |
} |
} |
|
if ($includestr{$type} ne '') { |
|
if ($includeloc{$type} eq 'b') { |
|
$resulttext .= '<br />'.&mt('Text automatically added to e-mail body:').' '.$includestr{$type}; |
|
} elsif ($includeloc{$type} eq 's') { |
|
$resulttext .= '<br />'.&mt('Text automatically added to e-mail subject:').' '.$includestr{$type}; |
|
} |
|
} |
|
} elsif (!@text) { |
|
$resulttext .= &mt('No recipients'); |
} |
} |
$resulttext .= '</li>'; |
$resulttext .= '</li>'; |
} |
} |
} |
} |
|
if (ref($changes{'overrides'}) eq 'ARRAY') { |
|
my @deletions; |
|
foreach my $type (@{$changes{'overrides'}}) { |
|
if ($usertypeshash{$type}) { |
|
if (grep(/^\Q$type\E/,@overrides)) { |
|
$resulttext .= '<li>'.&mt("Overrides based on requester's affiliation set for [_1]", |
|
$usertypeshash{$type}).'<ul><li>'; |
|
if (ref($newsetting{'override_'.$type}) eq 'HASH') { |
|
my @text; |
|
foreach my $item (@contacts) { |
|
if ($newsetting{'override_'.$type}{$item}) { |
|
push(@text,$short_titles->{$item}); |
|
} |
|
} |
|
if ($newsetting{'override_'.$type}{'others'} ne '') { |
|
push(@text,$newsetting{'override_'.$type}{'others'}); |
|
} |
|
|
|
if (@text) { |
|
$resulttext .= &mt('Helpdesk e-mail sent to: [_1]', |
|
'<span class="LC_cusr_emph">'.join(', ',@text).'</span>'); |
|
} |
|
if ($newsetting{'override_'.$type}{'bcc'} ne '') { |
|
my $bcctext; |
|
if (@text) { |
|
$bcctext = ' '.&mt('with Bcc to'); |
|
} else { |
|
$bcctext = '(Bcc)'; |
|
} |
|
$resulttext .= $bcctext.': <span class="LC_cusr_emph">'.$newsetting{'override_'.$type}{'bcc'}.'</span>'; |
|
} elsif (!@text) { |
|
$resulttext .= &mt('Helpdesk e-mail sent to no one'); |
|
} |
|
$resulttext .= '</li>'; |
|
if ($newsetting{'override_'.$type}{'include'} ne '') { |
|
my ($loc,$str) = split(/:/,$newsetting{'override_'.$type}{'include'}); |
|
if ($loc eq 'b') { |
|
$resulttext .= '<li>'.&mt('Text automatically added to e-mail body:').' '.&unescape($str).'</li>'; |
|
} elsif ($loc eq 's') { |
|
$resulttext .= '<li>'.&mt('Text automatically added to e-mail subject:').' '.&unescape($str).'</li>'; |
|
} |
|
} |
|
} |
|
$resulttext .= '</li></ul></li>'; |
|
} else { |
|
push(@deletions,$usertypeshash{$type}); |
|
} |
|
} |
|
} |
|
if (@deletions) { |
|
$resulttext .= '<li>'.&mt("Overrides based on requester's affiliation discontinued for: [_1]", |
|
join(', ',@deletions)).'</li>'; |
|
} |
|
} |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
|
my $corelink = &core_link_msu(); |
if ($changes{'reporterrors'}) { |
if ($changes{'reporterrors'}) { |
$resulttext .= '<li>'. |
$resulttext .= '<li>'. |
&mt('E-mail error reports to [_1] set to "'. |
&mt('E-mail error reports to [_1] set to "'. |
$offon[$env{'form.reporterrors'}].'".', |
$offon[$env{'form.reporterrors'}].'".', |
&Apache::loncommon::modal_link('http://loncapa.org/core.html', |
$corelink). |
&mt('LON-CAPA core group - MSU'),600,500)). |
|
'</li>'; |
'</li>'; |
} |
} |
if ($changes{'reportupdates'}) { |
if ($changes{'reportupdates'}) { |
$resulttext .= '<li>'. |
$resulttext .= '<li>'. |
&mt('E-mail record of completed LON-CAPA updates to [_1] set to "'. |
&mt('E-mail record of completed LON-CAPA updates to [_1] set to "'. |
$offon[$env{'form.reportupdates'}].'".', |
$offon[$env{'form.reportupdates'}].'".', |
&Apache::loncommon::modal_link('http://loncapa.org/core.html', |
$corelink). |
&mt('LON-CAPA core group - MSU'),600,500)). |
|
'</li>'; |
'</li>'; |
} |
} |
|
if ($changes{'reportstatus'}) { |
|
$resulttext .= '<li>'. |
|
&mt('E-mail status if errors above threshold to [_1] set to "'. |
|
$offon[$env{'form.reportstatus'}].'".', |
|
$corelink). |
|
'</li>'; |
|
} |
|
if (ref($changes{'lonstatus'}) eq 'ARRAY') { |
|
$resulttext .= '<li>'. |
|
&mt('Nightly status check e-mail settings').':<ul>'; |
|
my (%defval,%use_def,%shown); |
|
$defval{'threshold'} = $lonstatus_defs->{'threshold'}; |
|
$defval{'sysmail'} = $lonstatus_defs->{'sysmail'}; |
|
$defval{'weights'} = |
|
join(', ',map { $lonstatus_names->{$_}.'='.$lonstatus_defs->{$_}; } ('E','W','N','U')); |
|
$defval{'excluded'} = &mt('None'); |
|
if (ref($contacts_hash{'contacts'}{'lonstatus'}) eq 'HASH') { |
|
foreach my $item ('threshold','sysmail','weights','excluded') { |
|
if (exists($contacts_hash{'contacts'}{'lonstatus'}{$item})) { |
|
if (($item eq 'threshold') || ($item eq 'sysmail')) { |
|
$shown{$item} = $contacts_hash{'contacts'}{'lonstatus'}{$item}; |
|
} elsif ($item eq 'weights') { |
|
if (ref($contacts_hash{'contacts'}{'lonstatus'}{$item}) eq 'HASH') { |
|
foreach my $type ('E','W','N','U') { |
|
$shown{$item} .= $lonstatus_names->{$type}.'='; |
|
if (exists($contacts_hash{'contacts'}{'lonstatus'}{$item}{$type})) { |
|
$shown{$item} .= $contacts_hash{'contacts'}{'lonstatus'}{$item}{$type}; |
|
} else { |
|
$shown{$item} .= $lonstatus_defs->{$type}; |
|
} |
|
$shown{$item} .= ', '; |
|
} |
|
$shown{$item} =~ s/, $//; |
|
} else { |
|
$shown{$item} = $defval{$item}; |
|
} |
|
} elsif ($item eq 'excluded') { |
|
if (ref($contacts_hash{'contacts'}{'lonstatus'}{$item}) eq 'ARRAY') { |
|
$shown{$item} = join(', ',@{$contacts_hash{'contacts'}{'lonstatus'}{$item}}); |
|
} else { |
|
$shown{$item} = $defval{$item}; |
|
} |
|
} |
|
} else { |
|
$shown{$item} = $defval{$item}; |
|
} |
|
} |
|
} else { |
|
foreach my $item ('threshold','weights','excluded','sysmail') { |
|
$shown{$item} = $defval{$item}; |
|
} |
|
} |
|
foreach my $item ('threshold','weights','excluded','sysmail') { |
|
$resulttext .= '<li>'.&mt($titles->{'error'.$item}.' -- [_1]', |
|
$shown{$item}).'</li>'; |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
|
if ((ref($changes{'helpform'}) eq 'ARRAY') && (ref($fields) eq 'ARRAY')) { |
|
my (@optional,@required,@unused,$maxsizechg); |
|
foreach my $field (@{$changes{'helpform'}}) { |
|
if ($field eq 'maxsize') { |
|
$maxsizechg = 1; |
|
next; |
|
} |
|
if ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'yes') { |
|
push(@optional,$field); |
|
} elsif ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'no') { |
|
push(@unused,$field); |
|
} elsif ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'req') { |
|
push(@required,$field); |
|
} |
|
} |
|
if (@optional) { |
|
$resulttext .= '<li>'. |
|
&mt('Help form fields changed to "Optional": [_1].', |
|
'<span class="LC_cusr_emph">'.join(', ',map { $fieldtitles->{$_}; } @optional)).'</span>'. |
|
'</li>'; |
|
} |
|
if (@required) { |
|
$resulttext .= '<li>'. |
|
&mt('Help form fields changed to "Required": [_1].', |
|
'<span class="LC_cusr_emph">'.join(', ',map { $fieldtitles->{$_}; } @required)).'</span>'. |
|
'</li>'; |
|
} |
|
if (@unused) { |
|
$resulttext .= '<li>'. |
|
&mt('Help form fields changed to "Not shown": [_1].', |
|
'<span class="LC_cusr_emph">'.join(', ',map { $fieldtitles->{$_}; } @unused)).'</span>'. |
|
'</li>'; |
|
} |
|
if ($maxsizechg) { |
|
$resulttext .= '<li>'. |
|
&mt('Max size for file uploaded to help form by logged-in user set to [_1] MB.', |
|
$contacts_hash{'contacts'}{'helpform'}{'maxsize'}). |
|
'</li>'; |
|
} |
|
} |
$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 8083 sub modify_contacts {
|
Line 12702 sub modify_contacts {
|
return $resulttext; |
return $resulttext; |
} |
} |
|
|
|
sub modify_passwords { |
|
my ($r,$dom,$confname,$lastactref,%domconfig) = @_; |
|
my ($resulttext,%current,%changes,%newvalues,@oktypes,$errors, |
|
$updatedefaults,$updateconf); |
|
my $customfn = 'resetpw.html'; |
|
if (ref($domconfig{'passwords'}) eq 'HASH') { |
|
%current = %{$domconfig{'passwords'}}; |
|
} |
|
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
if (ref($types) eq 'ARRAY') { |
|
@oktypes = @{$types}; |
|
} |
|
push(@oktypes,'default'); |
|
|
|
my %titles = &Apache::lonlocal::texthash ( |
|
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', |
|
permanent => 'Permanent e-mail address', |
|
critical => 'Critical notification address', |
|
notify => 'Notification address', |
|
min => 'Minimum password length', |
|
max => 'Maximum password length', |
|
chars => 'Required characters', |
|
numsaved => 'Number of previous passwords to save', |
|
reset => 'Resetting Forgotten Password', |
|
intauth => 'Encryption of Stored Passwords (Internal Auth)', |
|
rules => 'Rules for LON-CAPA Passwords', |
|
crsownerchg => 'Course Owner Changing Student Passwords', |
|
username => 'Username', |
|
email => 'E-mail address', |
|
); |
|
|
|
# |
|
# Retrieve current domain configuration for internal authentication from $domconfig{'defaults'}. |
|
# |
|
my (%curr_defaults,%save_defaults); |
|
if (ref($domconfig{'defaults'}) eq 'HASH') { |
|
foreach my $key (keys(%{$domconfig{'defaults'}})) { |
|
if ($key =~ /^intauth_(cost|check|switch)$/) { |
|
$curr_defaults{$key} = $domconfig{'defaults'}{$key}; |
|
} else { |
|
$save_defaults{$key} = $domconfig{'defaults'}{$key}; |
|
} |
|
} |
|
} |
|
my %staticdefaults = ( |
|
'resetlink' => 2, |
|
'resetcase' => \@oktypes, |
|
'resetprelink' => 'both', |
|
'resetemail' => ['critical','notify','permanent'], |
|
'intauth_cost' => 10, |
|
'intauth_check' => 0, |
|
'intauth_switch' => 0, |
|
); |
|
$staticdefaults{'min'} = $Apache::lonnet::passwdmin; |
|
foreach my $type (@oktypes) { |
|
$staticdefaults{'resetpostlink'}{$type} = ['email','username']; |
|
} |
|
my $linklife = $env{'form.passwords_link'}; |
|
$linklife =~ s/^\s+|\s+$//g; |
|
if (($linklife =~ /^\d+(|\.\d*)$/) && ($linklife > 0)) { |
|
$newvalues{'resetlink'} = $linklife; |
|
if ($current{'resetlink'}) { |
|
if ($current{'resetlink'} ne $linklife) { |
|
$changes{'reset'} = 1; |
|
} |
|
} elsif (!ref($domconfig{passwords}) eq 'HASH') { |
|
if ($staticdefaults{'resetlink'} ne $linklife) { |
|
$changes{'reset'} = 1; |
|
} |
|
} |
|
} elsif ($current{'resetlink'}) { |
|
$changes{'reset'} = 1; |
|
} |
|
my @casesens; |
|
my @posscase = &Apache::loncommon::get_env_multiple('form.passwords_case_sensitive'); |
|
foreach my $case (sort(@posscase)) { |
|
if (grep(/^\Q$case\E$/,@oktypes)) { |
|
push(@casesens,$case); |
|
} |
|
} |
|
$newvalues{'resetcase'} = \@casesens; |
|
if (ref($current{'resetcase'}) eq 'ARRAY') { |
|
my @diffs = &Apache::loncommon::compare_arrays($current{'resetcase'},\@casesens); |
|
if (@diffs > 0) { |
|
$changes{'reset'} = 1; |
|
} |
|
} elsif (!ref($domconfig{passwords}) eq 'HASH') { |
|
my @diffs = &Apache::loncommon::compare_arrays($staticdefaults{'resetcase'},\@casesens); |
|
if (@diffs > 0) { |
|
$changes{'reset'} = 1; |
|
} |
|
} |
|
if ($env{'form.passwords_prelink'} =~ /^(both|either)$/) { |
|
$newvalues{'resetprelink'} = $env{'form.passwords_prelink'}; |
|
if (exists($current{'resetprelink'})) { |
|
if ($current{'resetprelink'} ne $newvalues{'resetprelink'}) { |
|
$changes{'reset'} = 1; |
|
} |
|
} elsif (!ref($domconfig{passwords}) eq 'HASH') { |
|
if ($staticdefaults{'resetprelink'} ne $newvalues{'resetprelink'}) { |
|
$changes{'reset'} = 1; |
|
} |
|
} |
|
} elsif ($current{'resetprelink'}) { |
|
$changes{'reset'} = 1; |
|
} |
|
foreach my $type (@oktypes) { |
|
my @possplink = &Apache::loncommon::get_env_multiple('form.passwords_postlink_'.$type); |
|
my @postlink; |
|
foreach my $item (sort(@possplink)) { |
|
if ($item =~ /^(email|username)$/) { |
|
push(@postlink,$item); |
|
} |
|
} |
|
$newvalues{'resetpostlink'}{$type} = \@postlink; |
|
unless ($changes{'reset'}) { |
|
if (ref($current{'resetpostlink'}) eq 'HASH') { |
|
if (ref($current{'resetpostlink'}{$type}) eq 'ARRAY') { |
|
my @diffs = &Apache::loncommon::compare_arrays($current{'resetpostlink'}{$type},\@postlink); |
|
if (@diffs > 0) { |
|
$changes{'reset'} = 1; |
|
} |
|
} else { |
|
$changes{'reset'} = 1; |
|
} |
|
} elsif (!ref($domconfig{passwords}) eq 'HASH') { |
|
my @diffs = &Apache::loncommon::compare_arrays($staticdefaults{'resetpostlink'}{$type},\@postlink); |
|
if (@diffs > 0) { |
|
$changes{'reset'} = 1; |
|
} |
|
} |
|
} |
|
} |
|
my @possemailsrc = &Apache::loncommon::get_env_multiple('form.passwords_emailsrc'); |
|
my @resetemail; |
|
foreach my $item (sort(@possemailsrc)) { |
|
if ($item =~ /^(permanent|critical|notify)$/) { |
|
push(@resetemail,$item); |
|
} |
|
} |
|
$newvalues{'resetemail'} = \@resetemail; |
|
unless ($changes{'reset'}) { |
|
if (ref($current{'resetemail'}) eq 'ARRAY') { |
|
my @diffs = &Apache::loncommon::compare_arrays($current{'resetemail'},\@resetemail); |
|
if (@diffs > 0) { |
|
$changes{'reset'} = 1; |
|
} |
|
} elsif (!ref($domconfig{passwords}) eq 'HASH') { |
|
my @diffs = &Apache::loncommon::compare_arrays($staticdefaults{'resetemail'},\@resetemail); |
|
if (@diffs > 0) { |
|
$changes{'reset'} = 1; |
|
} |
|
} |
|
} |
|
if ($env{'form.passwords_stdtext'} == 0) { |
|
$newvalues{'resetremove'} = 1; |
|
unless ($current{'resetremove'}) { |
|
$changes{'reset'} = 1; |
|
} |
|
} elsif ($current{'resetremove'}) { |
|
$changes{'reset'} = 1; |
|
} |
|
if ($env{'form.passwords_customfile.filename'} ne '') { |
|
my $servadm = $r->dir_config('lonAdmEMail'); |
|
my $servadm = $r->dir_config('lonAdmEMail'); |
|
my ($configuserok,$author_ok,$switchserver) = |
|
&config_check($dom,$confname,$servadm); |
|
my $error; |
|
if ($configuserok eq 'ok') { |
|
if ($switchserver) { |
|
$error = &mt("Upload of file containing domain-specific text is not permitted to this server: [_1]",$switchserver); |
|
} else { |
|
if ($author_ok eq 'ok') { |
|
my ($result,$customurl) = |
|
&publishlogo($r,'upload','passwords_customfile',$dom, |
|
$confname,'customtext/resetpw','','',$customfn); |
|
if ($result eq 'ok') { |
|
$newvalues{'resetcustom'} = $customurl; |
|
$changes{'reset'} = 1; |
|
} else { |
|
$error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$customfn,$result); |
|
} |
|
} else { |
|
$error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3]. Error was: [_4].",$customfn,$confname,$dom,$author_ok); |
|
} |
|
} |
|
} else { |
|
$error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3]. Error was: [_4].",$customfn,$confname,$dom,$configuserok); |
|
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} elsif ($current{'resetcustom'}) { |
|
if ($env{'form.passwords_custom_del'}) { |
|
$changes{'reset'} = 1; |
|
} else { |
|
$newvalues{'resetcustom'} = $current{'resetcustom'}; |
|
} |
|
} |
|
$env{'form.intauth_cost'} =~ s/^\s+|\s+$//g; |
|
if (($env{'form.intauth_cost'} ne '') && ($env{'form.intauth_cost'} =~ /^\d+$/)) { |
|
$save_defaults{'intauth_cost'} = $env{'form.intauth_cost'}; |
|
if ($save_defaults{'intauth_cost'} ne $curr_defaults{'intauth_cost'}) { |
|
$changes{'intauth'} = 1; |
|
} |
|
} else { |
|
$save_defaults{'intauth_cost'} = $curr_defaults{'intauth_cost'}; |
|
} |
|
if ($env{'form.intauth_check'} =~ /^(0|1|2)$/) { |
|
$save_defaults{'intauth_check'} = $env{'form.intauth_check'}; |
|
if ($save_defaults{'intauth_check'} ne $curr_defaults{'intauth_check'}) { |
|
$changes{'intauth'} = 1; |
|
} |
|
} else { |
|
$save_defaults{'intauth_check'} = $curr_defaults{'intauth_check'}; |
|
} |
|
if ($env{'form.intauth_switch'} =~ /^(0|1|2)$/) { |
|
$save_defaults{'intauth_switch'} = $env{'form.intauth_switch'}; |
|
if ($save_defaults{'intauth_switch'} ne $curr_defaults{'intauth_switch'}) { |
|
$changes{'intauth'} = 1; |
|
} |
|
} else { |
|
$save_defaults{'intauth_check'} = $curr_defaults{'intauth_check'}; |
|
} |
|
foreach my $item ('cost','check','switch') { |
|
if ($save_defaults{'intauth_'.$item} ne $domdefaults{'intauth_'.$item}) { |
|
$domdefaults{'intauth_'.$item} = $save_defaults{'intauth_'.$item}; |
|
$updatedefaults = 1; |
|
} |
|
} |
|
foreach my $rule ('min','max','numsaved') { |
|
$env{'form.passwords_'.$rule} =~ s/^\s+|\s+$//g; |
|
my $ruleok; |
|
if ($rule eq 'min') { |
|
if ($env{'form.passwords_'.$rule} =~ /^\d+$/) { |
|
if ($env{'form.passwords_'.$rule} >= $Apache::lonnet::passwdmin) { |
|
$ruleok = 1; |
|
} |
|
} |
|
} elsif (($env{'form.passwords_'.$rule} =~ /^\d+$/) && |
|
($env{'form.passwords_'.$rule} ne '0')) { |
|
$ruleok = 1; |
|
} |
|
if ($ruleok) { |
|
$newvalues{$rule} = $env{'form.passwords_'.$rule}; |
|
if (exists($current{$rule})) { |
|
if ($newvalues{$rule} ne $current{$rule}) { |
|
$changes{'rules'} = 1; |
|
} |
|
} elsif ($rule eq 'min') { |
|
if ($staticdefaults{$rule} ne $newvalues{$rule}) { |
|
$changes{'rules'} = 1; |
|
} |
|
} else { |
|
$changes{'rules'} = 1; |
|
} |
|
} elsif (exists($current{$rule})) { |
|
$changes{'rules'} = 1; |
|
} |
|
} |
|
my @posschars = &Apache::loncommon::get_env_multiple('form.passwords_chars'); |
|
my @chars; |
|
foreach my $item (sort(@posschars)) { |
|
if ($item =~ /^(uc|lc|num|spec)$/) { |
|
push(@chars,$item); |
|
} |
|
} |
|
$newvalues{'chars'} = \@chars; |
|
unless ($changes{'rules'}) { |
|
if (ref($current{'chars'}) eq 'ARRAY') { |
|
my @diffs = &Apache::loncommon::compare_arrays($current{'chars'},\@chars); |
|
if (@diffs > 0) { |
|
$changes{'rules'} = 1; |
|
} |
|
} else { |
|
if (@chars > 0) { |
|
$changes{'rules'} = 1; |
|
} |
|
} |
|
} |
|
my %crsownerchg = ( |
|
by => [], |
|
for => [], |
|
); |
|
foreach my $item ('by','for') { |
|
my @posstypes = &Apache::loncommon::get_env_multiple('form.passwords_crsowner_'.$item); |
|
foreach my $type (sort(@posstypes)) { |
|
if (grep(/^\Q$type\E$/,@oktypes)) { |
|
push(@{$crsownerchg{$item}},$type); |
|
} |
|
} |
|
} |
|
$newvalues{'crsownerchg'} = \%crsownerchg; |
|
if (ref($current{'crsownerchg'}) eq 'HASH') { |
|
foreach my $item ('by','for') { |
|
if (ref($current{'crsownerchg'}{$item}) eq 'ARRAY') { |
|
my @diffs = &Apache::loncommon::compare_arrays($current{'crsownerchg'}{$item},$crsownerchg{$item}); |
|
if (@diffs > 0) { |
|
$changes{'crsownerchg'} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
} elsif (!(ref($domconfig{passwords}) eq 'HASH')) { |
|
foreach my $item ('by','for') { |
|
if (@{$crsownerchg{$item}} > 0) { |
|
$changes{'crsownerchg'} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
|
|
my %confighash = ( |
|
defaults => \%save_defaults, |
|
passwords => \%newvalues, |
|
); |
|
&process_captcha('passwords',\%changes,$confighash{'passwords'},$domconfig{'passwords'}); |
|
|
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%confighash,$dom); |
|
if ($putresult eq 'ok') { |
|
if (keys(%changes) > 0) { |
|
$resulttext = &mt('Changes made: ').'<ul>'; |
|
foreach my $key ('reset','intauth','rules','crsownerchg') { |
|
if ($changes{$key}) { |
|
unless ($key eq 'intauth') { |
|
$updateconf = 1; |
|
} |
|
$resulttext .= '<li>'.$titles{$key}.':<ul>'; |
|
if ($key eq 'reset') { |
|
if ($confighash{'passwords'}{'captcha'} eq 'original') { |
|
$resulttext .= '<li>'.&mt('CAPTCHA validation set to use: original CAPTCHA').'</li>'; |
|
} elsif ($confighash{'passwords'}{'captcha'} eq 'recaptcha') { |
|
$resulttext .= '<li>'.&mt('CAPTCHA validation set to use: reCAPTCHA').' '. |
|
&mt('version: [_1]',$confighash{'passwords'}{'recaptchaversion'}).'<br />'; |
|
if (ref($confighash{'passwords'}{'recaptchakeys'}) eq 'HASH') { |
|
$resulttext .= &mt('Public key: [_1]',$confighash{'passwords'}{'recaptchakeys'}{'public'}).'</br>'. |
|
&mt('Private key: [_1]',$confighash{'passwords'}{'recaptchakeys'}{'private'}).'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('No CAPTCHA validation').'</li>'; |
|
} |
|
if ($confighash{'passwords'}{'resetlink'}) { |
|
$resulttext .= '<li>'.&mt('Reset link expiration set to [quant,_1,hour]',$confighash{'passwords'}{'resetlink'}).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No reset link expiration set.').' '. |
|
&mt('Will default to 2 hours').'</li>'; |
|
} |
|
if (ref($confighash{'passwords'}{'resetcase'}) eq 'ARRAY') { |
|
if (@{$confighash{'passwords'}{'resetcase'}} == 0) { |
|
$resulttext .= '<li>'.&mt('User input for username and/or e-mail address not case sensitive for "Forgot Password" web form').'</li>'; |
|
} else { |
|
my $casesens; |
|
foreach my $type (@{$confighash{'passwords'}{'resetcase'}}) { |
|
if ($type eq 'default') { |
|
$casesens .= $othertitle.', '; |
|
} elsif ($usertypes->{$type} ne '') { |
|
$casesens .= $usertypes->{$type}.', '; |
|
} |
|
} |
|
$casesens =~ s/\Q, \E$//; |
|
$resulttext .= '<li>'.&mt('"Forgot Password" web form input for username and/or e-mail address is case-sensitive for: [_1]',$casesens).'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('Case-sensitivity not set for "Forgot Password" web form').' '.&mt('Will default to case-sensitive for username and/or e-mail address for all').'</li>'; |
|
} |
|
if ($confighash{'passwords'}{'resetprelink'} eq 'either') { |
|
$resulttext .= '<li>'.&mt('Users can enter either a username or an e-mail address in "Forgot Password" web form').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Users can enter both a username and an e-mail address in "Forgot Password" web form').'</li>'; |
|
} |
|
if (ref($confighash{'passwords'}{'resetpostlink'}) eq 'HASH') { |
|
my $output; |
|
if (ref($types) eq 'ARRAY') { |
|
foreach my $type (@{$types}) { |
|
if (ref($confighash{'passwords'}{'resetpostlink'}{$type}) eq 'ARRAY') { |
|
if (@{$confighash{'passwords'}{'resetpostlink'}{$type}} == 0) { |
|
$output .= $usertypes->{$type}.' -- '.&mt('none'); |
|
} else { |
|
$output .= $usertypes->{$type}.' -- '. |
|
join(', ',map { $titles{$_}; } (@{$confighash{'passwords'}{'resetpostlink'}{$type}})).'; '; |
|
} |
|
} |
|
} |
|
} |
|
if (ref($confighash{'passwords'}{'resetpostlink'}{'default'}) eq 'ARRAY') { |
|
if (@{$confighash{'passwords'}{'resetpostlink'}{'default'}} == 0) { |
|
$output .= $othertitle.' -- '.&mt('none'); |
|
} else { |
|
$output .= $othertitle.' -- '. |
|
join(', ',map { $titles{$_}; } (@{$confighash{'passwords'}{'resetpostlink'}{'default'}})); |
|
} |
|
} |
|
if ($output) { |
|
$resulttext .= '<li>'.&mt('Information required for new password form (by user type) set to: [_1]',$output).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Information required for new password form not set.').' '.&mt('Will default to requiring both the username and an e-mail address').'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('Information required for new password form not set.').' '.&mt('Will default to requiring both the username and an e-mail address').'</li>'; |
|
} |
|
if (ref($confighash{'passwords'}{'resetemail'}) eq 'ARRAY') { |
|
if (@{$confighash{'passwords'}{'resetemail'}} > 0) { |
|
$resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$confighash{'passwords'}{'resetemail'}})).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'</li>'; |
|
} |
|
if ($confighash{'passwords'}{'resetremove'}) { |
|
$resulttext .= '<li>'.&mt('Preamble to "Forgot Password" web form not shown').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Preamble to "Forgot Password" web form is shown').'</li>'; |
|
} |
|
if ($confighash{'passwords'}{'resetcustom'}) { |
|
my $customlink = &Apache::loncommon::modal_link($confighash{'passwords'}{'resetcustom'}, |
|
&mt('custom text'),600,500,undef,undef, |
|
undef,undef,'background-color:#ffffff'); |
|
$resulttext .= '<li>'.&mt('Preamble to "Forgot Password" form includes: [_1]',$customlink).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No custom text included in preamble to "Forgot Password" form').'</li>'; |
|
} |
|
} elsif ($key eq 'intauth') { |
|
foreach my $item ('cost','switch','check') { |
|
my $value = $save_defaults{$key.'_'.$item}; |
|
if ($item eq '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 '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]"',$titles{$key.'_'.$item},$value).'</li>'; |
|
} |
|
} elsif ($key eq 'rules') { |
|
foreach my $rule ('min','max','numsaved') { |
|
if ($confighash{'passwords'}{$rule} eq '') { |
|
if ($rule eq 'min') { |
|
$resulttext .= '<li>'.&mt('[_1] not set.',$titles{$rule}); |
|
' '.&mt('Default of [_1] will be used', |
|
$Apache::lonnet::passwdmin).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('[_1] set to none',$titles{$rule}).'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('[_1] set to [_2]',$titles{$rule},$confighash{'passwords'}{$rule}).'</li>'; |
|
} |
|
} |
|
if (ref($confighash{'passwords'}{'chars'}) eq 'ARRAY') { |
|
if (@{$confighash{'passwords'}{'chars'}} > 0) { |
|
my %rulenames = &Apache::lonlocal::texthash( |
|
uc => 'At least one upper case letter', |
|
lc => 'At least one lower case letter', |
|
num => 'At least one number', |
|
spec => 'At least one non-alphanumeric', |
|
); |
|
my $needed = '<ul><li>'. |
|
join('</li><li>',map {$rulenames{$_} } @{$confighash{'passwords'}{'chars'}}). |
|
'</li></ul>'; |
|
$resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{'chars'},$needed).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>'; |
|
} |
|
} elsif ($key eq 'crsownerchg') { |
|
if (ref($confighash{'passwords'}{'crsownerchg'}) eq 'HASH') { |
|
if ((@{$confighash{'passwords'}{'crsownerchg'}{'by'}} == 0) || |
|
(@{$confighash{'passwords'}{'crsownerchg'}{'for'}} == 0)) { |
|
$resulttext .= '<li>'.&mt('Course owner may not change student passwords.').'</li>'; |
|
} else { |
|
my %crsownerstr; |
|
foreach my $item ('by','for') { |
|
if (ref($confighash{'passwords'}{'crsownerchg'}{$item}) eq 'ARRAY') { |
|
foreach my $type (@{$confighash{'passwords'}{'crsownerchg'}{$item}}) { |
|
if ($type eq 'default') { |
|
$crsownerstr{$item} .= $othertitle.', '; |
|
} elsif ($usertypes->{$type} ne '') { |
|
$crsownerstr{$item} .= $usertypes->{$type}.', '; |
|
} |
|
} |
|
$crsownerstr{$item} =~ s/\Q, \E$//; |
|
} |
|
} |
|
$resulttext .= '<li>'.&mt('Course owner (with status: [_1]) may change passwords for students (with status: [_2]).', |
|
$crsownerstr{'by'},$crsownerstr{'for'}).'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('Course owner may not change student passwords.').'</li>'; |
|
} |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
|
} |
|
$resulttext .= '</ul>'; |
|
} else { |
|
$resulttext = &mt('No changes made to password settings'); |
|
} |
|
my $cachetime = 24*60*60; |
|
if ($updatedefaults) { |
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
|
} |
|
if ($updateconf) { |
|
&Apache::lonnet::do_cache_new('passwdconf',$dom,$confighash{'passwords'},$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'passwdconf'} = 1; |
|
} |
|
} |
|
} else { |
|
$resulttext = '<span class="LC_error">'. |
|
&mt('An error occurred: [_1]',$putresult).'</span>'; |
|
} |
|
if ($errors) { |
|
$resulttext .= '<p>'.&mt('The following errors occurred: ').'<ul>'. |
|
$errors.'</ul></p>'; |
|
} |
|
return $resulttext; |
|
} |
|
|
sub modify_usercreation { |
sub modify_usercreation { |
my ($dom,%domconfig) = @_; |
my ($dom,%domconfig) = @_; |
my ($resulttext,%curr_usercreation,%changes,%authallowed,%cancreate,%save_usercreate); |
my ($resulttext,%curr_usercreation,%changes,%authallowed,%cancreate,%save_usercreate); |
Line 8092 sub modify_usercreation {
|
Line 13254 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')) { |
|
$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 8299 sub modify_usercreation {
|
Line 13460 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 8316 sub modify_selfcreation {
|
Line 13481 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 'emailusername') || ($item eq 'notify') || |
($item eq 'recaptchaversion') || ($item eq 'notify') || |
($item eq 'selfcreateprocessing')) { |
($item eq 'emailusername') || ($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 8344 sub modify_selfcreation {
|
Line 13511 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{'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 @statuses; |
my ($emailrules,$emailruleorder) = &Apache::lonnet::inst_userrules($dom,'email'); |
if (ref($domconfig{'inststatus'}) eq 'HASH') { |
|
if (ref($domconfig{'inststatus'}{'inststatusguest'}) eq 'ARRAY') { |
|
@statuses = @{$domconfig{'inststatus'}{'inststatusguest'}}; |
|
} |
|
} |
|
push(@statuses,'default'); |
|
|
|
|
my (@statuses,%email_rule); |
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 8387 sub modify_selfcreation {
|
Line 13675 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 |
# value set to one), if self-creation with e-mail address permitted, where $type is user type: faculty, staff, student etc. |
# value set to one), if self-creation with e-mail address permitted, where $type is user type: faculty, staff, student etc. |
# |
# |
|
|
if ($env{'form.cancreate_email'} eq '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 8409 sub modify_selfcreation {
|
Line 13697 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 8429 sub modify_selfcreation {
|
Line 13717 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 8467 sub modify_selfcreation {
|
Line 13732 sub modify_selfcreation {
|
} |
} |
my @fields = ('lastname','firstname','middlename','generation', |
my @fields = ('lastname','firstname','middlename','generation', |
'permanentemail','id'); |
'permanentemail','id'); |
|
my @shibfields = (@fields,'inststatus'); |
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
# |
# |
# Where usernames may created for institutional log-in and/or institutional single sign on: |
# Where usernames may created for institutional log-in and/or institutional single sign on: |
Line 8476 sub modify_selfcreation {
|
Line 13742 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 8494 sub modify_selfcreation {
|
Line 13756 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 8506 sub modify_selfcreation {
|
Line 13768 sub modify_selfcreation {
|
} |
} |
} |
} |
} else { |
} else { |
foreach my $type (@{$types}) { |
foreach my $type (@types) { |
push(@{$changes{'selfcreate'}},$type); |
push(@{$changes{'selfcreate'}},$type); |
} |
} |
} |
} |
} |
} |
|
foreach my $field (@shibfields) { |
|
if ($env{'form.shibenv_'.$field} ne '') { |
|
$cancreate{'shibenv'}{$field} = $env{'form.shibenv_'.$field}; |
|
} |
|
} |
|
if (ref($curr_usercreation{'cancreate'}) eq 'HASH') { |
|
if (ref($curr_usercreation{'cancreate'}{'shibenv'}) eq 'HASH') { |
|
foreach my $field (@shibfields) { |
|
if ($env{'form.shibenv_'.$field} ne $curr_usercreation{'cancreate'}{'shibenv'}{$field}) { |
|
push(@{$changes{'cancreate'}},'shibenv'); |
|
} |
|
} |
|
} else { |
|
foreach my $field (@shibfields) { |
|
if ($env{'form.shibenv_'.$field}) { |
|
push(@{$changes{'cancreate'}},'shibenv'); |
|
last; |
|
} |
|
} |
|
} |
|
} |
} |
} |
foreach my $item (@contexts) { |
foreach my $item (@contexts) { |
if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') { |
if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') { |
Line 8534 sub modify_selfcreation {
|
Line 13817 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 8572 sub modify_selfcreation {
|
Line 13849 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 8594 sub modify_selfcreation {
|
Line 13865 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 8623 sub modify_selfcreation {
|
Line 13894 sub modify_selfcreation {
|
# |
# |
$save_usercreate{'cancreate'}{'captcha'} = $savecaptcha{'captcha'}; |
$save_usercreate{'cancreate'}{'captcha'} = $savecaptcha{'captcha'}; |
$save_usercreate{'cancreate'}{'recaptchakeys'} = $savecaptcha{'recaptchakeys'}; |
$save_usercreate{'cancreate'}{'recaptchakeys'} = $savecaptcha{'recaptchakeys'}; |
|
$save_usercreate{'cancreate'}{'recaptchaversion'} = $savecaptcha{'recaptchaversion'}; |
$save_usercreate{'cancreate'}{'selfcreate'} = $cancreate{'selfcreate'}; |
$save_usercreate{'cancreate'}{'selfcreate'} = $cancreate{'selfcreate'}; |
if (ref($cancreate{'notify'}) eq 'HASH') { |
if (ref($cancreate{'notify'}) eq 'HASH') { |
$save_usercreate{'cancreate'}{'notify'} = $cancreate{'notify'}; |
$save_usercreate{'cancreate'}{'notify'} = $cancreate{'notify'}; |
Line 8630 sub modify_selfcreation {
|
Line 13902 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'}; |
} |
} |
|
if (ref($cancreate{'shibenv'}) eq 'HASH') { |
|
$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 8651 sub modify_selfcreation {
|
Line 13937 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 8666 sub modify_selfcreation {
|
Line 13952 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') { |
|
if (keys(%{$cancreate{$type}}) == 0) { |
|
$chgtext .= &mt('Shibboleth-autheticated user does not use environment variables to set user information').'<br />'; |
|
} else { |
|
$chgtext .= &mt('Shibboleth-autheticated user information set from environment variables, as follows:'). |
|
'<ul>'; |
|
foreach my $field (@shibfields) { |
|
next if ($cancreate{$type}{$field} eq ''); |
|
if ($field eq 'inststatus') { |
|
$chgtext .= '<li>'.&mt('Institutional status').' -- '.$cancreate{$type}{$field}.'</li>'; |
|
} else { |
|
$chgtext .= '<li>'.$fieldtitles{$field}.' -- '.$cancreate{$type}{$field}.'</li>'; |
|
} |
} |
} |
|
$chgtext .= '</ul>'; |
} |
} |
} elsif ($type eq 'statustocreate') { |
} elsif ($type eq 'statustocreate') { |
if ((ref($cancreate{'selfcreate'}) eq 'ARRAY') && |
if ((ref($cancreate{'selfcreate'}) eq 'ARRAY') && |
Line 8687 sub modify_selfcreation {
|
Line 13996 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 8698 sub modify_selfcreation {
|
Line 14007 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 8715 sub modify_selfcreation {
|
Line 14024 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 ($status 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 8765 sub modify_selfcreation {
|
Line 14177 sub modify_selfcreation {
|
$chgtext .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>'; |
$chgtext .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>'; |
} |
} |
$chgtext .= '</ul>'; |
$chgtext .= '</ul>'; |
|
} elsif ($type eq 'recaptchaversion') { |
|
if ($savecaptcha{'captcha'} eq 'recaptcha') { |
|
$chgtext .= &mt('ReCAPTCHA set to version [_1]',$savecaptcha{$type}); |
|
} |
} 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}) { |
$chgtext .= '<li>'.$infotitles->{$field}.'</li>'; |
$chgtext .= '<li>'.$infotitles->{$field}.'</li>'; |
} |
} |
} |
} |
|
$chgtext .= '</ul>'; |
|
} else { |
|
$chgtext .= &mt('When self creating account with e-mail verification, no information besides e-mail address will be provided by [_1].',"'$usertypes{$type}'").'<br />'; |
} |
} |
$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 />'; |
} |
} |
} |
} |
} |
} |
} |
} |
} 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>'; |
|
my $typename; |
|
if (@types) { |
|
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.'). |
|
'</li>'. |
|
&mt('(Affiliation: [_1])',$typename); |
|
} |
} |
} |
} |
} |
$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 8827 sub modify_selfcreation {
|
Line 14283 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 8852 sub modify_selfcreation {
|
Line 14308 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 8866 sub modify_selfcreation {
|
Line 14328 sub modify_selfcreation {
|
} |
} |
|
|
sub process_captcha { |
sub process_captcha { |
my ($container,$changes,$newsettings,$current) = @_; |
my ($container,$changes,$newsettings,$currsettings) = @_; |
return unless ((ref($changes) eq 'HASH') && (ref($newsettings) eq 'HASH') || (ref($current) eq 'HASH')); |
return unless ((ref($changes) eq 'HASH') && (ref($newsettings) eq 'HASH')); |
$newsettings->{'captcha'} = $env{'form.'.$container.'_captcha'}; |
$newsettings->{'captcha'} = $env{'form.'.$container.'_captcha'}; |
unless ($newsettings->{'captcha'} eq 'recaptcha' || $newsettings->{'captcha'} eq 'notused') { |
unless ($newsettings->{'captcha'} eq 'recaptcha' || $newsettings->{'captcha'} eq 'notused') { |
$newsettings->{'captcha'} = 'original'; |
$newsettings->{'captcha'} = 'original'; |
} |
} |
if ($current->{'captcha'} ne $newsettings->{'captcha'}) { |
my %current; |
|
if (ref($currsettings) eq 'HASH') { |
|
%current = %{$currsettings}; |
|
} |
|
if ($current{'captcha'} ne $newsettings->{'captcha'}) { |
if ($container eq 'cancreate') { |
if ($container eq 'cancreate') { |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
push(@{$changes->{'cancreate'}},'captcha'); |
push(@{$changes->{'cancreate'}},'captcha'); |
} elsif (!defined($changes->{'cancreate'})) { |
} elsif (!defined($changes->{'cancreate'})) { |
$changes->{'cancreate'} = ['captcha']; |
$changes->{'cancreate'} = ['captcha']; |
} |
} |
|
} elsif ($container eq 'passwords') { |
|
$changes->{'reset'} = 1; |
} else { |
} else { |
$changes->{'captcha'} = 1; |
$changes->{'captcha'} = 1; |
} |
} |
} |
} |
my ($newpub,$newpriv,$currpub,$currpriv); |
my ($newpub,$newpriv,$currpub,$currpriv,$newversion,$currversion); |
if ($newsettings->{'captcha'} eq 'recaptcha') { |
if ($newsettings->{'captcha'} eq 'recaptcha') { |
$newpub = $env{'form.'.$container.'_recaptchapub'}; |
$newpub = $env{'form.'.$container.'_recaptchapub'}; |
$newpriv = $env{'form.'.$container.'_recaptchapriv'}; |
$newpriv = $env{'form.'.$container.'_recaptchapriv'}; |
$newpub =~ s/\W//g; |
$newpub =~ s/[^\w\-]//g; |
$newpriv =~ s/\W//g; |
$newpriv =~ s/[^\w\-]//g; |
$newsettings->{'recaptchakeys'} = { |
$newsettings->{'recaptchakeys'} = { |
public => $newpub, |
public => $newpub, |
private => $newpriv, |
private => $newpriv, |
}; |
}; |
} |
$newversion = $env{'form.'.$container.'_recaptchaversion'}; |
if (ref($current->{'recaptchakeys'}) eq 'HASH') { |
$newversion =~ s/\D//g; |
$currpub = $current->{'recaptchakeys'}{'public'}; |
if ($newversion ne '2') { |
$currpriv = $current->{'recaptchakeys'}{'private'}; |
$newversion = 1; |
|
} |
|
$newsettings->{'recaptchaversion'} = $newversion; |
|
} |
|
if (ref($current{'recaptchakeys'}) eq 'HASH') { |
|
$currpub = $current{'recaptchakeys'}{'public'}; |
|
$currpriv = $current{'recaptchakeys'}{'private'}; |
unless ($newsettings->{'captcha'} eq 'recaptcha') { |
unless ($newsettings->{'captcha'} eq 'recaptcha') { |
$newsettings->{'recaptchakeys'} = { |
$newsettings->{'recaptchakeys'} = { |
public => '', |
public => '', |
Line 8904 sub process_captcha {
|
Line 14378 sub process_captcha {
|
} |
} |
} |
} |
} |
} |
|
if ($current{'captcha'} eq 'recaptcha') { |
|
$currversion = $current{'recaptchaversion'}; |
|
if ($currversion ne '2') { |
|
$currversion = 1; |
|
} |
|
} |
|
if ($currversion ne $newversion) { |
|
if ($container eq 'cancreate') { |
|
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
|
push(@{$changes->{'cancreate'}},'recaptchaversion'); |
|
} elsif (!defined($changes->{'cancreate'})) { |
|
$changes->{'cancreate'} = ['recaptchaversion']; |
|
} |
|
} elsif ($container eq 'passwords') { |
|
$changes->{'reset'} = 1; |
|
} else { |
|
$changes->{'recaptchaversion'} = 1; |
|
} |
|
} |
if (($newpub ne $currpub) || ($newpriv ne $currpriv)) { |
if (($newpub ne $currpub) || ($newpriv ne $currpriv)) { |
if ($container eq 'cancreate') { |
if ($container eq 'cancreate') { |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
Line 8911 sub process_captcha {
|
Line 14404 sub process_captcha {
|
} elsif (!defined($changes->{'cancreate'})) { |
} elsif (!defined($changes->{'cancreate'})) { |
$changes->{'cancreate'} = ['recaptchakeys']; |
$changes->{'cancreate'} = ['recaptchakeys']; |
} |
} |
|
} elsif ($container eq 'passwords') { |
|
$changes->{'reset'} = 1; |
} else { |
} else { |
$changes->{'recaptchakeys'} = 1; |
$changes->{'recaptchakeys'} = 1; |
} |
} |
Line 9025 sub modify_defaults {
|
Line 14520 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'); |
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 9075 sub modify_defaults {
|
Line 14571 sub modify_defaults {
|
} |
} |
$domdefaults{$item} = $newvalues{$item}; |
$domdefaults{$item} = $newvalues{$item}; |
} |
} |
|
my %staticdefaults = ( |
|
'intauth_cost' => 10, |
|
'intauth_check' => 0, |
|
'intauth_switch' => 0, |
|
); |
|
foreach my $item ('intauth_cost','intauth_check','intauth_switch') { |
|
if (exists($domdefaults{$item})) { |
|
$newvalues{$item} = $domdefaults{$item}; |
|
} else { |
|
$newvalues{$item} = $staticdefaults{$item}; |
|
} |
|
} |
my %defaults_hash = ( |
my %defaults_hash = ( |
defaults => \%newvalues, |
defaults => \%newvalues, |
); |
); |
Line 9093 sub modify_defaults {
|
Line 14601 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) eq 'HASH') { |
|
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 9110 sub modify_defaults {
|
Line 14627 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 9126 sub modify_defaults {
|
Line 14637 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 9138 sub modify_defaults {
|
Line 14646 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 9155 sub modify_defaults {
|
Line 14660 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 9165 sub modify_defaults {
|
Line 14670 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 9186 sub modify_defaults {
|
Line 14688 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 9269 sub modify_scantron {
|
Line 14760 sub modify_scantron {
|
my $custom = 'custom.tab'; |
my $custom = 'custom.tab'; |
my $default = 'default.tab'; |
my $default = 'default.tab'; |
my $servadm = $r->dir_config('lonAdmEMail'); |
my $servadm = $r->dir_config('lonAdmEMail'); |
my ($configuserok,$author_ok,$switchserver) = |
my ($configuserok,$author_ok,$switchserver) = |
&config_check($dom,$confname,$servadm); |
&config_check($dom,$confname,$servadm); |
if ($env{'form.scantronformat.filename'} ne '') { |
if ($env{'form.scantronformat.filename'} ne '') { |
my $error; |
my $error; |
Line 9304 sub modify_scantron {
|
Line 14795 sub modify_scantron {
|
if ($env{'form.scantronformat_del'}) { |
if ($env{'form.scantronformat_del'}) { |
$confhash{'scantron'}{'scantronformat'} = ''; |
$confhash{'scantron'}{'scantronformat'} = ''; |
$changes{'scantronformat'} = 1; |
$changes{'scantronformat'} = 1; |
|
} else { |
|
$confhash{'scantron'}{'scantronformat'} = $domconfig{'scantron'}{'scantronformat'}; |
|
} |
|
} |
|
} |
|
my @options = ('hdr','pad','rem'); |
|
my @fields = &scantroncsv_fields(); |
|
my %titles = &scantronconfig_titles(); |
|
my @formats = &Apache::loncommon::get_env_multiple('form.scantronconfig'); |
|
my ($newdat,$currdat,%newcol,%currcol); |
|
if (grep(/^dat$/,@formats)) { |
|
$confhash{'scantron'}{config}{dat} = 1; |
|
$newdat = 1; |
|
} else { |
|
$newdat = 0; |
|
} |
|
if (grep(/^csv$/,@formats)) { |
|
my %bynum; |
|
foreach my $field (@fields) { |
|
if ($env{'form.scantronconfig_csv_'.$field} =~ /^(\d+)$/) { |
|
my $posscol = $1; |
|
if (($posscol < 20) && (!$bynum{$posscol})) { |
|
$confhash{'scantron'}{config}{csv}{fields}{$field} = $posscol; |
|
$bynum{$posscol} = $field; |
|
$newcol{$field} = $posscol; |
|
} |
|
} |
|
} |
|
if (keys(%newcol)) { |
|
foreach my $option (@options) { |
|
if ($env{'form.scantroncsv_'.$option}) { |
|
$confhash{'scantron'}{config}{csv}{options}{$option} = 1; |
|
} |
|
} |
|
} |
|
} |
|
$currdat = 1; |
|
if (ref($domconfig{'scantron'}) eq 'HASH') { |
|
if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') { |
|
unless (exists($domconfig{'scantron'}{'config'}{'dat'})) { |
|
$currdat = 0; |
|
} |
|
if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') { |
|
if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') { |
|
%currcol = %{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}; |
|
} |
|
} |
|
} |
|
} |
|
if ($currdat != $newdat) { |
|
$changes{'config'} = 1; |
|
} else { |
|
foreach my $field (@fields) { |
|
if ($currcol{$field} ne '') { |
|
if ($currcol{$field} ne $newcol{$field}) { |
|
$changes{'config'} = 1; |
|
last; |
|
} |
|
} elsif ($newcol{$field} ne '') { |
|
$changes{'config'} = 1; |
|
last; |
} |
} |
} |
} |
} |
} |
Line 9314 sub modify_scantron {
|
Line 14866 sub modify_scantron {
|
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
if (ref($confhash{'scantron'}) eq 'HASH') { |
if (ref($confhash{'scantron'}) eq 'HASH') { |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
if ($confhash{'scantron'}{'scantronformat'} eq '') { |
if ($changes{'scantronformat'}) { |
$resulttext .= '<li>'.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>'; |
if ($confhash{'scantron'}{'scantronformat'} eq '') { |
} else { |
$resulttext .= '<li>'.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>'; |
$resulttext .= '<li>'.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>'; |
} else { |
|
$resulttext .= '<li>'.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>'; |
|
} |
|
} |
|
if ($changes{'config'}) { |
|
if (ref($confhash{'scantron'}{'config'}) eq 'HASH') { |
|
if ($confhash{'scantron'}{'config'}{'dat'}) { |
|
$resulttext .= '<li>'.&mt('Bubblesheet data upload formats includes .dat format').'</li>'; |
|
} |
|
if (ref($confhash{'scantron'}{'config'}{'csv'}) eq 'HASH') { |
|
if (ref($confhash{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') { |
|
if (keys(%{$confhash{'scantron'}{'config'}{'csv'}{'fields'}})) { |
|
$resulttext .= '<li>'.&mt('Bubblesheet data upload formats includes .csv format, with following fields/column numbers supported:').'<ul>'; |
|
foreach my $field (@fields) { |
|
if ($confhash{'scantron'}{'config'}{'csv'}{'fields'}{$field} ne '') { |
|
my $showcol = $confhash{'scantron'}{'config'}{'csv'}{'fields'}{$field} + 1; |
|
$resulttext .= '<li>'.$titles{$field}.': '.$showcol.'</li>'; |
|
} |
|
} |
|
$resulttext .= '</ul></li>'; |
|
if (ref($confhash{'scantron'}{'config'}{'csv'}{'options'}) eq 'HASH') { |
|
if (keys(%{$confhash{'scantron'}{'config'}{'csv'}{'options'}})) { |
|
$resulttext .= '<li>'.&mt('Bubblesheet data upload formats includes .csv format, with following options:').'<ul>'; |
|
foreach my $option (@options) { |
|
if ($confhash{'scantron'}{'config'}{'csv'}{'options'}{$option} ne '') { |
|
$resulttext .= '<li>'.$titles{$option}.'</li>'; |
|
} |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('No bubblesheet data upload formats set -- will default to assuming .dat format').'</li>'; |
|
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
$resulttext = &mt('Changes made to bubblesheet format file.'); |
$resulttext = &mt('Changes made to bubblesheet format file.'); |
} |
} |
$resulttext .= '</ul>'; |
|
&Apache::loncommon::devalidate_domconfig_cache($dom); |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
$lastactref->{'domainconfig'} = 1; |
$lastactref->{'domainconfig'} = 1; |
} |
} |
} else { |
} else { |
$resulttext = &mt('No changes made to bubblesheet format file'); |
$resulttext = &mt('No changes made to bubblesheet format settings'); |
} |
} |
} else { |
} else { |
$resulttext = '<span class="LC_error">'. |
$resulttext = '<span class="LC_error">'. |
&mt('An error occurred: [_1]',$putresult).'</span>'; |
&mt('An error occurred: [_1]',$putresult).'</span>'; |
} |
} |
} else { |
} else { |
$resulttext = &mt('No changes made to bubblesheet format file'); |
$resulttext = &mt('No changes made to bubblesheet format settings'); |
} |
} |
if ($errors) { |
if ($errors) { |
$resulttext .= &mt('The following errors occurred: ').'<ul>'. |
$resulttext .= &mt('The following errors occurred: ').'<ul>'. |
Line 9585 sub modify_coursecategories {
|
Line 15172 sub modify_coursecategories {
|
} |
} |
$resulttext .= '</ul></li>'; |
$resulttext .= '</ul></li>'; |
} |
} |
|
&Apache::lonnet::do_cache_new('cats',$dom,$cathash,3600); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'cats'} = 1; |
|
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
if ($changes{'unauth'} || $changes{'auth'}) { |
if ($changes{'unauth'} || $changes{'auth'}) { |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
|
if ($changes{'auth'}) { |
|
$domdefaults{'catauth'} = $domconfig{'coursecategories'}{'auth'}; |
|
} |
|
if ($changes{'unauth'}) { |
|
$domdefaults{'catunauth'} = $domconfig{'coursecategories'}{'unauth'}; |
|
} |
|
my $cachetime = 24*60*60; |
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
$lastactref->{'domainconfig'} = 1; |
$lastactref->{'domdefaults'} = 1; |
} |
} |
} |
} |
} else { |
} else { |
Line 9728 sub modify_serverstatuses {
|
Line 15327 sub modify_serverstatuses {
|
} |
} |
|
|
sub modify_helpsettings { |
sub modify_helpsettings { |
my ($r,$dom,$confname,%domconfig) = @_; |
my ($r,$dom,$confname,$lastactref,%domconfig) = @_; |
my ($resulttext,$errors,%changes,%helphash); |
my ($resulttext,$errors,%changes,%helphash); |
my %defaultchecked = ('submitbugs' => 'on'); |
my %defaultchecked = ('submitbugs' => 'on'); |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
my @toggles = ('submitbugs'); |
my @toggles = ('submitbugs'); |
|
my %current = ('submitbugs' => '', |
|
'adhoc' => {}, |
|
); |
if (ref($domconfig{'helpsettings'}) eq 'HASH') { |
if (ref($domconfig{'helpsettings'}) eq 'HASH') { |
foreach my $item (@toggles) { |
%current = %{$domconfig{'helpsettings'}}; |
if ($defaultchecked{$item} eq 'on') { |
} |
if ($domconfig{'helpsettings'}{$item} eq '') { |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
if ($env{'form.'.$item} eq '0') { |
foreach my $item (@toggles) { |
$changes{$item} = 1; |
if ($defaultchecked{$item} eq 'on') { |
} |
if ($current{$item} eq '') { |
} elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) { |
if ($env{'form.'.$item} eq '0') { |
$changes{$item} = 1; |
$changes{$item} = 1; |
} |
} |
} elsif ($defaultchecked{$item} eq 'off') { |
} elsif ($current{$item} ne $env{'form.'.$item}) { |
if ($domconfig{'helpsettings'}{$item} eq '') { |
$changes{$item} = 1; |
if ($env{'form.'.$item} eq '1') { |
} |
$changes{$item} = 1; |
} elsif ($defaultchecked{$item} eq 'off') { |
} |
if ($current{$item} eq '') { |
} elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) { |
if ($env{'form.'.$item} eq '1') { |
$changes{$item} = 1; |
$changes{$item} = 1; |
} |
} |
|
} elsif ($current{$item} ne $env{'form.'.$item}) { |
|
$changes{$item} = 1; |
|
} |
|
} |
|
if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) { |
|
$helphash{'helpsettings'}{$item} = $env{'form.'.$item}; |
|
} |
|
} |
|
my $maxnum = $env{'form.helproles_maxnum'}; |
|
my $confname = $dom.'-domainconfig'; |
|
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
|
my (@allpos,%newsettings,%changedprivs,$newrole); |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
my @accesstypes = ('all','dh','da','none','status','inc','exc'); |
|
my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']); |
|
my %lt = &Apache::lonlocal::texthash( |
|
s => 'system', |
|
d => 'domain', |
|
order => 'Display order', |
|
access => 'Role usage', |
|
all => 'All with domain helpdesk or helpdesk assistant role', |
|
dh => 'All with domain helpdesk role', |
|
da => 'All with domain helpdesk assistant role', |
|
none => 'None', |
|
status => 'Determined based on institutional status', |
|
inc => 'Include all, but exclude specific personnel', |
|
exc => 'Exclude all, but include specific personnel', |
|
); |
|
for (my $num=0; $num<=$maxnum; $num++) { |
|
my ($prefix,$identifier,$rolename,%curr); |
|
if ($num == $maxnum) { |
|
next unless ($env{'form.newcusthelp'} == $maxnum); |
|
$identifier = 'custhelp'.$num; |
|
$prefix = 'helproles_'.$num; |
|
$rolename = $env{'form.custhelpname'.$num}; |
|
$rolename=~s/[^A-Za-z0-9]//gs; |
|
next if ($rolename eq ''); |
|
next if (exists($existing{'rolesdef_'.$rolename})); |
|
my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$identifier); |
|
my $result = &Apache::lonnet::definerole($rolename,$newprivs{'s'},$newprivs{'d'}, |
|
$newprivs{'c'},$confname,$dom); |
|
if ($result ne 'ok') { |
|
$errors .= '<li><span class="LC_error">'. |
|
&mt('An error occurred storing the new custom role: [_1]', |
|
$result).'</span></li>'; |
|
next; |
|
} else { |
|
$changedprivs{$rolename} = \%newprivs; |
|
$newrole = $rolename; |
|
} |
|
} else { |
|
$prefix = 'helproles_'.$num; |
|
$rolename = $env{'form.'.$prefix}; |
|
next if ($rolename eq ''); |
|
next unless (exists($existing{'rolesdef_'.$rolename})); |
|
$identifier = 'custhelp'.$num; |
|
my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$identifier); |
|
my %currprivs; |
|
($currprivs{'s'},$currprivs{'d'},$currprivs{'c'}) = |
|
split(/\_/,$existing{'rolesdef_'.$rolename}); |
|
foreach my $level ('c','d','s') { |
|
if ($newprivs{$level} ne $currprivs{$level}) { |
|
my $result = &Apache::lonnet::definerole($rolename,$newprivs{'s'},$newprivs{'d'}, |
|
$newprivs{'c'},$confname,$dom); |
|
if ($result ne 'ok') { |
|
$errors .= '<li><span class="LC_error">'. |
|
&mt('An error occurred storing privileges for existing role [_1]: [_2]', |
|
$rolename,$result).'</span></li>'; |
|
} else { |
|
$changedprivs{$rolename} = \%newprivs; |
|
} |
|
last; |
|
} |
} |
} |
if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) { |
if (ref($current{'adhoc'}) eq 'HASH') { |
$helphash{'helpsettings'}{$item} = $env{'form.'.$item}; |
if (ref($current{'adhoc'}{$rolename}) eq 'HASH') { |
|
%curr = %{$current{'adhoc'}{$rolename}}; |
|
} |
|
} |
|
} |
|
my $newpos = $env{'form.'.$prefix.'_pos'}; |
|
$newpos =~ s/\D+//g; |
|
$allpos[$newpos] = $rolename; |
|
my $newdesc = $env{'form.'.$prefix.'_desc'}; |
|
$helphash{'helpsettings'}{'adhoc'}{$rolename}{'desc'} = $newdesc; |
|
if ($curr{'desc'}) { |
|
if ($curr{'desc'} ne $newdesc) { |
|
$changes{'customrole'}{$rolename}{'desc'} = 1; |
|
$newsettings{$rolename}{'desc'} = $newdesc; |
|
} |
|
} elsif ($newdesc ne '') { |
|
$changes{'customrole'}{$rolename}{'desc'} = 1; |
|
$newsettings{$rolename}{'desc'} = $newdesc; |
|
} |
|
my $access = $env{'form.'.$prefix.'_access'}; |
|
if (grep(/^\Q$access\E$/,@accesstypes)) { |
|
$helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = $access; |
|
if ($access eq 'status') { |
|
my @statuses = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_status'); |
|
if (scalar(@statuses) == 0) { |
|
$helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = 'none'; |
|
} else { |
|
my (@shownstatus,$numtypes); |
|
$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access} = []; |
|
if (ref($types) eq 'ARRAY') { |
|
$numtypes = scalar(@{$types}); |
|
foreach my $type (sort(@statuses)) { |
|
if ($type eq 'default') { |
|
push(@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}},$type); |
|
} elsif (grep(/^\Q$type\E$/,@{$types})) { |
|
push(@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}},$type); |
|
push(@shownstatus,$usertypes->{$type}); |
|
} |
|
} |
|
} |
|
if (grep(/^default$/,@statuses)) { |
|
push(@shownstatus,$othertitle); |
|
} |
|
if (scalar(@shownstatus) == 1+$numtypes) { |
|
$helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = 'all'; |
|
delete($helphash{'helpsettings'}{'adhoc'}{$rolename}{'status'}); |
|
} else { |
|
$newsettings{$rolename}{'status'} = join(' '.&mt('or').' ',@shownstatus); |
|
if (ref($curr{'status'}) eq 'ARRAY') { |
|
my @diffs = &Apache::loncommon::compare_arrays($helphash{'helpsettings'}{'adhoc'}{$rolename}{$access},$curr{$access}); |
|
if (@diffs) { |
|
$changes{'customrole'}{$rolename}{$access} = 1; |
|
} |
|
} elsif (@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}}) { |
|
$changes{'customrole'}{$rolename}{$access} = 1; |
|
} |
|
} |
|
} |
|
} elsif (($access eq 'inc') || ($access eq 'exc')) { |
|
my @personnel = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_staff_'.$access); |
|
my @newspecstaff; |
|
$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access} = []; |
|
foreach my $person (sort(@personnel)) { |
|
if ($domhelpdesk{$person}) { |
|
push(@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}},$person); |
|
} |
|
} |
|
if (ref($curr{$access}) eq 'ARRAY') { |
|
my @diffs = &Apache::loncommon::compare_arrays($helphash{'helpsettings'}{'adhoc'}{$rolename}{$access},$curr{$access}); |
|
if (@diffs) { |
|
$changes{'customrole'}{$rolename}{$access} = 1; |
|
} |
|
} elsif (@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}}) { |
|
$changes{'customrole'}{$rolename}{$access} = 1; |
|
} |
|
foreach my $person (@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}}) { |
|
my ($uname,$udom) = split(/:/,$person); |
|
push(@newspecstaff,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom,'lastname'),$uname,$udom)); |
|
} |
|
$newsettings{$rolename}{$access} = join(', ',sort(@newspecstaff)); |
|
} |
|
} else { |
|
$helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'}= 'all'; |
|
} |
|
unless ($curr{'access'} eq $access) { |
|
$changes{'customrole'}{$rolename}{'access'} = 1; |
|
$newsettings{$rolename}{'access'} = $lt{$helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'}}; |
|
} |
|
} |
|
if (@allpos > 0) { |
|
my $idx = 0; |
|
foreach my $rolename (@allpos) { |
|
if ($rolename ne '') { |
|
$helphash{'helpsettings'}{'adhoc'}{$rolename}{'order'} = $idx; |
|
if (ref($current{'adhoc'}) eq 'HASH') { |
|
if (ref($current{'adhoc'}{$rolename}) eq 'HASH') { |
|
if ($current{'adhoc'}{$rolename}{'order'} ne $idx) { |
|
$changes{'customrole'}{$rolename}{'order'} = 1; |
|
$newsettings{$rolename}{'order'} = $idx+1; |
|
} |
|
} |
|
} |
|
$idx ++; |
} |
} |
} |
} |
} |
} |
Line 9761 sub modify_helpsettings {
|
Line 15538 sub modify_helpsettings {
|
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
$putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom); |
$putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
$resulttext = &mt('Changes made:').'<ul>'; |
if (ref($helphash{'helpsettings'}) eq 'HASH') { |
|
$domdefaults{'submitbugs'} = $helphash{'helpsettings'}{'submitbugs'}; |
|
if (ref($helphash{'helpsettings'}{'adhoc'}) eq 'HASH') { |
|
$domdefaults{'adhocroles'} = $helphash{'helpsettings'}{'adhoc'}; |
|
} |
|
} |
|
my $cachetime = 24*60*60; |
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
|
} else { |
|
$errors .= '<li><span class="LC_error">'. |
|
&mt('An error occurred storing the settings: [_1]', |
|
$putresult).'</span></li>'; |
|
} |
|
} |
|
if ((keys(%changes) && ($putresult eq 'ok')) || (keys(%changedprivs))) { |
|
$resulttext = &mt('Changes made:').'<ul>'; |
|
my (%shownprivs,@levelorder); |
|
@levelorder = ('c','d','s'); |
|
if ((keys(%changes)) && ($putresult eq 'ok')) { |
foreach my $item (sort(keys(%changes))) { |
foreach my $item (sort(keys(%changes))) { |
if ($item eq 'submitbugs') { |
if ($item eq 'submitbugs') { |
$resulttext .= '<li>'.&mt('Display link to: [_1] set to "'.$offon[$env{'form.'.$item}].'".', |
$resulttext .= '<li>'.&mt('Display link to: [_1] set to "'.$offon[$env{'form.'.$item}].'".', |
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
&mt('LON-CAPA bug tracker'),600,500)).'</li>'; |
&mt('LON-CAPA bug tracker'),600,500)).'</li>'; |
|
} elsif ($item eq 'customrole') { |
|
if (ref($changes{'customrole'}) eq 'HASH') { |
|
my @keyorder = ('order','desc','access','status','exc','inc'); |
|
my %keytext = &Apache::lonlocal::texthash( |
|
order => 'Order', |
|
desc => 'Role description', |
|
access => 'Role usage', |
|
status => 'Allowed institutional types', |
|
exc => 'Allowed personnel', |
|
inc => 'Disallowed personnel', |
|
); |
|
foreach my $role (sort(keys(%{$changes{'customrole'}}))) { |
|
if (ref($changes{'customrole'}{$role}) eq 'HASH') { |
|
if ($role eq $newrole) { |
|
$resulttext .= '<li>'.&mt('New custom role added: [_1]', |
|
$role).'<ul>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Existing custom role modified: [_1]', |
|
$role).'<ul>'; |
|
} |
|
foreach my $key (@keyorder) { |
|
if ($changes{'customrole'}{$role}{$key}) { |
|
$resulttext .= '<li>'.&mt("[_1] set to: [_2]", |
|
$keytext{$key},$newsettings{$role}{$key}). |
|
'</li>'; |
|
} |
|
} |
|
if (ref($changedprivs{$role}) eq 'HASH') { |
|
$shownprivs{$role} = 1; |
|
$resulttext .= '<li>'.&mt('Privileges set to :').'<ul>'; |
|
foreach my $level (@levelorder) { |
|
foreach my $item (split(/\:/,$changedprivs{$role}{$level})) { |
|
next if ($item eq ''); |
|
my ($priv) = split(/\&/,$item,2); |
|
if (&Apache::lonnet::plaintext($priv)) { |
|
$resulttext .= '<li>'.&Apache::lonnet::plaintext($priv); |
|
unless ($level eq 'c') { |
|
$resulttext .= ' ('.$lt{$level}.')'; |
|
} |
|
$resulttext .= '</li>'; |
|
} |
|
} |
|
} |
|
$resulttext .= '</ul>'; |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
|
} |
|
} |
} |
} |
} |
} |
$resulttext .= '</ul>'; |
|
} else { |
|
$resulttext = &mt('No changes made to help settings'); |
|
$errors .= '<li><span class="LC_error">'. |
|
&mt('An error occurred storing the settings: [_1]', |
|
$putresult).'</span></li>'; |
|
} |
} |
|
if (keys(%changedprivs)) { |
|
foreach my $role (sort(keys(%changedprivs))) { |
|
unless ($shownprivs{$role}) { |
|
$resulttext .= '<li>'.&mt('Existing custom role modified: [_1]', |
|
$role).'<ul>'. |
|
'<li>'.&mt('Privileges set to :').'<ul>'; |
|
foreach my $level (@levelorder) { |
|
foreach my $item (split(/\:/,$changedprivs{$role}{$level})) { |
|
next if ($item eq ''); |
|
my ($priv) = split(/\&/,$item,2); |
|
if (&Apache::lonnet::plaintext($priv)) { |
|
$resulttext .= '<li>'.&Apache::lonnet::plaintext($priv); |
|
unless ($level eq 'c') { |
|
$resulttext .= ' ('.$lt{$level}.')'; |
|
} |
|
$resulttext .= '</li>'; |
|
} |
|
} |
|
} |
|
$resulttext .= '</ul></li></ul></li>'; |
|
} |
|
} |
|
} |
|
$resulttext .= '</ul>'; |
|
} else { |
|
$resulttext = &mt('No changes made to help settings'); |
} |
} |
if ($errors) { |
if ($errors) { |
$resulttext .= '<br />'.&mt('The following errors occurred: ').'<ul>'. |
$resulttext .= '<br />'.&mt('The following errors occurred: ').'<ul>'. |
$errors.'</ul>'; |
$errors.'</ul>'; |
} |
} |
return $resulttext; |
return $resulttext; |
} |
} |
Line 9787 sub modify_helpsettings {
|
Line 15654 sub modify_helpsettings {
|
sub modify_coursedefaults { |
sub modify_coursedefaults { |
my ($dom,$lastactref,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
my ($resulttext,$errors,%changes,%defaultshash); |
my ($resulttext,$errors,%changes,%defaultshash); |
my %defaultchecked = ('canuse_pdfforms' => 'off'); |
my %defaultchecked = ( |
my @toggles = ('canuse_pdfforms'); |
'uselcmath' => 'on', |
|
'usejsme' => 'on', |
|
'inline_chem' => 'on', |
|
); |
|
my @toggles = ('uselcmath','usejsme','inline_chem'); |
my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial', |
my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial', |
'uploadquota_community','uploadquota_textbook'); |
'uploadquota_community','uploadquota_textbook','mysqltables_official', |
|
'mysqltables_unofficial','mysqltables_community','mysqltables_textbook'); |
my @types = ('official','unofficial','community','textbook'); |
my @types = ('official','unofficial','community','textbook'); |
my %staticdefaults = ( |
my %staticdefaults = ( |
anonsurvey_threshold => 10, |
anonsurvey_threshold => 10, |
uploadquota => 500, |
uploadquota => 500, |
|
postsubmit => 60, |
|
mysqltables => 172800, |
); |
); |
|
my %texoptions = ( |
|
MathJax => 'MathJax', |
|
mimetex => &mt('Convert to Images'), |
|
tth => &mt('TeX to HTML'), |
|
); |
$defaultshash{'coursedefaults'} = {}; |
$defaultshash{'coursedefaults'} = {}; |
|
|
if (ref($domconfig{'coursedefaults'}) ne 'HASH') { |
if (ref($domconfig{'coursedefaults'}) ne 'HASH') { |
Line 9835 sub modify_coursedefaults {
|
Line 15713 sub modify_coursedefaults {
|
} |
} |
$defaultshash{'coursedefaults'}{$item} = $newdef; |
$defaultshash{'coursedefaults'}{$item} = $newdef; |
} else { |
} else { |
my ($type) = ($item =~ /^\Quploadquota_\E(\w+)$/); |
my ($setting,$type) = ($item =~ /^(uploadquota|mysqltables)_(\w+)$/); |
if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') { |
if (ref($domconfig{'coursedefaults'}{$setting}) eq 'HASH') { |
$currdef = $domconfig{'coursedefaults'}{'uploadquota'}{$type}; |
$currdef = $domconfig{'coursedefaults'}{$setting}{$type}; |
} |
} |
$newdef =~ s/[^\w.\-]//g; |
$newdef =~ s/[^\w.\-]//g; |
$defaultshash{'coursedefaults'}{'uploadquota'}{$type} = $newdef; |
$defaultshash{'coursedefaults'}{$setting}{$type} = $newdef; |
} |
} |
if ($currdef ne $newdef) { |
if ($currdef ne $newdef) { |
my $staticdef; |
|
if ($item eq 'anonsurvey_threshold') { |
if ($item eq 'anonsurvey_threshold') { |
unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) { |
unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
} |
} |
} else { |
} elsif ($item =~ /^(uploadquota|mysqltables)_/) { |
unless (($currdef eq '') && ($newdef == $staticdefaults{'uploadquota'})) { |
my $setting = $1; |
$changes{'uploadquota'} = 1; |
unless (($currdef eq '') && ($newdef == $staticdefaults{$setting})) { |
|
$changes{$setting} = 1; |
} |
} |
} |
} |
} |
} |
} |
} |
|
my $texengine; |
my $officialcreds = $env{'form.official_credits'}; |
if ($env{'form.texengine'} =~ /^(MathJax|mimetex|tth)$/) { |
$officialcreds =~ s/[^\d.]+//g; |
$texengine = $env{'form.texengine'}; |
my $unofficialcreds = $env{'form.unofficial_credits'}; |
my $currdef = $domconfig{'coursedefaults'}{'texengine'}; |
$unofficialcreds =~ s/[^\d.]+//g; |
if ($currdef eq '') { |
my $textbookcreds = $env{'form.textbook_credits'}; |
unless ($texengine eq $Apache::lonnet::deftex) { |
$textbookcreds =~ s/[^\d.]+//g; |
$changes{'texengine'} = 1; |
if (ref($domconfig{'coursedefaults'}{'coursecredits'} ne 'HASH') && |
} |
($env{'form.coursecredits'} eq '1')) { |
} elsif ($currdef ne $texengine) { |
$changes{'coursecredits'} = 1; |
$changes{'texengine'} = 1; |
|
} |
|
} |
|
if ($texengine ne '') { |
|
$defaultshash{'coursedefaults'}{'texengine'} = $texengine; |
|
} |
|
my $currclone = $domconfig{'coursedefaults'}{'canclone'}; |
|
my @currclonecode; |
|
if (ref($currclone) eq 'HASH') { |
|
if (ref($currclone->{'instcode'}) eq 'ARRAY') { |
|
@currclonecode = @{$currclone->{'instcode'}}; |
|
} |
|
} |
|
my $newclone; |
|
if ($env{'form.canclone'} =~ /^(none|domain|instcode)$/) { |
|
$newclone = $env{'form.canclone'}; |
|
} |
|
if ($newclone eq 'instcode') { |
|
my @newcodes = &Apache::loncommon::get_env_multiple('form.clonecode'); |
|
my (%codedefaults,@code_order,@clonecode); |
|
&Apache::lonnet::auto_instcode_defaults($dom,\%codedefaults, |
|
\@code_order); |
|
foreach my $item (@code_order) { |
|
if (grep(/^\Q$item\E$/,@newcodes)) { |
|
push(@clonecode,$item); |
|
} |
|
} |
|
if (@clonecode) { |
|
$defaultshash{'coursedefaults'}{'canclone'} = { $newclone => \@clonecode }; |
|
my @diffs = &Apache::loncommon::compare_arrays(\@currclonecode,\@clonecode); |
|
if (@diffs) { |
|
$changes{'canclone'} = 1; |
|
} |
|
} else { |
|
$newclone eq ''; |
|
} |
|
} elsif ($newclone ne '') { |
|
$defaultshash{'coursedefaults'}{'canclone'} = $newclone; |
|
} |
|
if ($newclone ne $currclone) { |
|
$changes{'canclone'} = 1; |
|
} |
|
my %credits; |
|
foreach my $type (@types) { |
|
unless ($type eq 'community') { |
|
$credits{$type} = $env{'form.'.$type.'_credits'}; |
|
$credits{$type} =~ s/[^\d.]+//g; |
|
} |
|
} |
|
if ((ref($domconfig{'coursedefaults'}{'coursecredits'}) ne 'HASH') && |
|
($env{'form.coursecredits'} eq '1')) { |
|
$changes{'coursecredits'} = 1; |
|
foreach my $type (keys(%credits)) { |
|
$defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type}; |
|
} |
} else { |
} else { |
if (($domconfig{'coursedefaults'}{'coursecredits'}{'official'} ne $officialcreds) || |
if ($env{'form.coursecredits'} eq '1') { |
($domconfig{'coursedefaults'}{'coursecredits'}{'unofficial'} ne $unofficialcreds) || |
foreach my $type (@types) { |
($domconfig{'coursedefaults'}{'coursecredits'}{'textbook'} ne $textbookcreds)) { |
unless ($type eq 'community') { |
$changes{'coursecredits'} = 1; |
if ($domconfig{'coursedefaults'}{'coursecredits'}{$type} ne $credits{$type}) { |
|
$changes{'coursecredits'} = 1; |
|
} |
|
$defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type}; |
|
} |
|
} |
|
} elsif (ref($domconfig{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
|
foreach my $type (@types) { |
|
unless ($type eq 'community') { |
|
if ($domconfig{'coursedefaults'}{'coursecredits'}{$type}) { |
|
$changes{'coursecredits'} = 1; |
|
last; |
|
} |
|
} |
|
} |
} |
} |
} |
} |
$defaultshash{'coursedefaults'}{'coursecredits'} = { |
if ($env{'form.postsubmit'} eq '1') { |
official => $officialcreds, |
$defaultshash{'coursedefaults'}{'postsubmit'}{'client'} = 'on'; |
unofficial => $unofficialcreds, |
my %currtimeout; |
textbook => $textbookcreds, |
if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') { |
|
if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'off') { |
|
$changes{'postsubmit'} = 1; |
|
} |
|
if (ref($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') { |
|
%currtimeout = %{$domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}}; |
|
} |
|
} else { |
|
$changes{'postsubmit'} = 1; |
|
} |
|
foreach my $type (@types) { |
|
my $timeout = $env{'form.'.$type.'_timeout'}; |
|
$timeout =~ s/\D//g; |
|
if ($timeout == $staticdefaults{'postsubmit'}) { |
|
$timeout = ''; |
|
} elsif (($timeout eq '') || ($timeout =~ /^0+$/)) { |
|
$timeout = '0'; |
|
} |
|
unless ($timeout eq '') { |
|
$defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}{$type} = $timeout; |
|
} |
|
if (exists($currtimeout{$type})) { |
|
if ($timeout ne $currtimeout{$type}) { |
|
$changes{'postsubmit'} = 1; |
|
} |
|
} elsif ($timeout ne '') { |
|
$changes{'postsubmit'} = 1; |
|
} |
|
} |
|
} else { |
|
$defaultshash{'coursedefaults'}{'postsubmit'}{'client'} = 'off'; |
|
if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') { |
|
if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'on') { |
|
$changes{'postsubmit'} = 1; |
|
} |
|
} else { |
|
$changes{'postsubmit'} = 1; |
|
} |
} |
} |
} |
} |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
Line 9883 sub modify_coursedefaults {
|
Line 15866 sub modify_coursedefaults {
|
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'}) || |
if (($changes{'uploadquota'}) || ($changes{'postsubmit'}) || |
($changes{'uploadquota'})) { |
($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) || |
if ($changes{'canuse_pdfforms'}) { |
($changes{'canclone'}) || ($changes{'mysqltables'}) || ($changes{'texengine'}) || |
$domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'}; |
($changes{'inline_chem'})) { |
|
foreach my $item ('uselcmath','usejsme','inline_chem','texengine') { |
|
if ($changes{$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') { |
$domdefaults{'officialcredits'} = |
foreach my $type (keys(%{$defaultshash{'coursedefaults'}{'coursecredits'}})) { |
$defaultshash{'coursedefaults'}{'coursecredits'}{'official'}; |
$domdefaults{$type.'credits'} = |
$domdefaults{'unofficialcredits'} = |
$defaultshash{'coursedefaults'}{'coursecredits'}{$type}; |
$defaultshash{'coursedefaults'}{'coursecredits'}{'unofficial'}; |
} |
$domdefaults{'textbookcredits'} = |
} |
$domdefaults{'coursedefaults'}{'coursecredits'}{'textbook'}; |
} |
|
if ($changes{'postsubmit'}) { |
|
if (ref($defaultshash{'coursedefaults'}{'postsubmit'}) eq 'HASH') { |
|
$domdefaults{'postsubmit'} = $defaultshash{'coursedefaults'}{'postsubmit'}{'client'}; |
|
if (ref($defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') { |
|
foreach my $type (keys(%{$defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}})) { |
|
$domdefaults{$type.'postsubtimeout'} = |
|
$defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}{$type}; |
|
} |
|
} |
} |
} |
} |
} |
if ($changes{'uploadquota'}) { |
if ($changes{'uploadquota'}) { |
Line 9905 sub modify_coursedefaults {
|
Line 15901 sub modify_coursedefaults {
|
} |
} |
} |
} |
} |
} |
|
if ($changes{'canclone'}) { |
|
if (ref($defaultshash{'coursedefaults'}{'canclone'}) eq 'HASH') { |
|
if (ref($defaultshash{'coursedefaults'}{'canclone'}{'instcode'}) eq 'ARRAY') { |
|
my @clonecodes = @{$defaultshash{'coursedefaults'}{'canclone'}{'instcode'}}; |
|
if (@clonecodes) { |
|
$domdefaults{'canclone'} = join('+',@clonecodes); |
|
} |
|
} |
|
} else { |
|
$domdefaults{'canclone'}=$defaultshash{'coursedefaults'}{'canclone'}; |
|
} |
|
} |
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); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
Line 9913 sub modify_coursedefaults {
|
Line 15921 sub modify_coursedefaults {
|
} |
} |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
foreach my $item (sort(keys(%changes))) { |
foreach my $item (sort(keys(%changes))) { |
if ($item eq 'canuse_pdfforms') { |
if ($item eq 'uselcmath') { |
|
if ($env{'form.'.$item} eq '1') { |
|
$resulttext .= '<li>'.&mt('Math preview uses LON-CAPA previewer (javascript), if supported by browser.').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Math preview uses DragMath (Java), if supported by client OS.').'</li>'; |
|
} |
|
} elsif ($item eq 'usejsme') { |
if ($env{'form.'.$item} eq '1') { |
if ($env{'form.'.$item} eq '1') { |
$resulttext .= '<li>'.&mt("Course/Community users can create/upload PDF forms set to 'on'").'</li>'; |
$resulttext .= '<li>'.&mt('Molecule editor uses JSME (HTML5), if supported by browser.').'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>'; |
$resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>'; |
|
} |
|
} elsif ($item eq 'inline_chem') { |
|
if ($env{'form.'.$item} eq '1') { |
|
$resulttext .= '<li>'.&mt('Chemical Reaction Response uses inline previewer').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Chemical Reaction Response uses pop-up previewer').'</li>'; |
|
} |
|
} elsif ($item eq 'texengine') { |
|
if ($defaultshash{'coursedefaults'}{'texengine'} ne '') { |
|
$resulttext .= '<li>'.&mt('Default method to display mathematics set to: "[_1]"', |
|
$texoptions{$defaultshash{'coursedefaults'}{'texengine'}}).'</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 9934 sub modify_coursedefaults {
|
Line 15959 sub modify_coursedefaults {
|
} else { |
} else { |
$resulttext .= '<li>'.&mt('Default quota for content uploaded via Course Editor remains default: [_1] MB',$staticdefaults{'uploadquota'}).'</li>'; |
$resulttext .= '<li>'.&mt('Default quota for content uploaded via Course Editor remains default: [_1] MB',$staticdefaults{'uploadquota'}).'</li>'; |
} |
} |
|
} elsif ($item eq 'mysqltables') { |
|
if (ref($defaultshash{'coursedefaults'}{'mysqltables'}) eq 'HASH') { |
|
$resulttext .= '<li>'.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver').'<ul>'. |
|
'<li>'.&mt('Official courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'official'}.'</b>').'</li>'. |
|
'<li>'.&mt('Unofficial courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'unofficial'}.'</b>').'</li>'. |
|
'<li>'.&mt('Textbook courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'textbook'}.'</b>').'</li>'. |
|
'<li>'.&mt('Communities: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'community'}.'</b>').'</li>'. |
|
'</ul>'. |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver remains default: [_1] s',$staticdefaults{'uploadquota'}).'</li>'; |
|
} |
|
} elsif ($item eq 'postsubmit') { |
|
if ($domdefaults{'postsubmit'} eq 'off') { |
|
$resulttext .= '<li>'.&mt('Submit button(s) remain enabled on page after student makes submission.'); |
|
} else { |
|
$resulttext .= '<li>'.&mt('Submit button(s) disabled on page after student makes submission').'; '; |
|
if (ref($defaultshash{'coursedefaults'}{'postsubmit'}) eq 'HASH') { |
|
$resulttext .= &mt('durations:').'<ul>'; |
|
foreach my $type (@types) { |
|
$resulttext .= '<li>'; |
|
my $timeout; |
|
if (ref($defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') { |
|
$timeout = $defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}{$type}; |
|
} |
|
my $display; |
|
if ($timeout eq '0') { |
|
$display = &mt('unlimited'); |
|
} elsif ($timeout eq '') { |
|
$display = &mt('[quant,_1,second] (default)',$staticdefaults{'postsubmit'}); |
|
} else { |
|
$display = &mt('[quant,_1,second]',$timeout); |
|
} |
|
if ($type eq 'community') { |
|
$resulttext .= &mt('Communities'); |
|
} elsif ($type eq 'official') { |
|
$resulttext .= &mt('Official courses'); |
|
} elsif ($type eq 'unofficial') { |
|
$resulttext .= &mt('Unofficial courses'); |
|
} elsif ($type eq 'textbook') { |
|
$resulttext .= &mt('Textbook courses'); |
|
} |
|
$resulttext .= ' -- '.$display.'</li>'; |
|
} |
|
$resulttext .= '</ul>'; |
|
} |
|
$resulttext .= '</li>'; |
|
} |
} elsif ($item eq 'coursecredits') { |
} elsif ($item eq 'coursecredits') { |
if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
if (($domdefaults{'officialcredits'} eq '') && |
if (($domdefaults{'officialcredits'} eq '') && |
Line 9951 sub modify_coursedefaults {
|
Line 16024 sub modify_coursedefaults {
|
} else { |
} else { |
$resulttext .= '<li>'.&mt('Student credits not in use for courses in this domain').'</li>'; |
$resulttext .= '<li>'.&mt('Student credits not in use for courses in this domain').'</li>'; |
} |
} |
|
} elsif ($item eq 'canclone') { |
|
if (ref($defaultshash{'coursedefaults'}{'canclone'}) eq 'HASH') { |
|
if (ref($defaultshash{'coursedefaults'}{'canclone'}{'instcode'}) eq 'ARRAY') { |
|
my $clonecodes = join(' '.&mt('and').' ',@{$defaultshash{'coursedefaults'}{'canclone'}{'instcode'}}); |
|
$resulttext .= '<li>'.&mt('By default, official courses can be cloned from existing courses with the same: [_1]','<b>'.$clonecodes.'</b>').'</li>'; |
|
} |
|
} elsif ($defaultshash{'coursedefaults'}{'canclone'} eq 'domain') { |
|
$resulttext .= '<li>'.&mt('By default, a course requester can clone any course from his/her domain.').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('By default, only course owner and coordinators may clone a course.').'</li>'; |
|
} |
} |
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
Line 10184 sub modify_selfenrollment {
|
Line 16268 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 10203 sub modify_selfenrollment {
|
Line 16287 sub modify_selfenrollment {
|
return $resulttext; |
return $resulttext; |
} |
} |
|
|
|
sub modify_wafproxy { |
|
my ($dom,$action,$lastactref,%domconfig) = @_; |
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
|
my (%othercontrol,%canset,%values,%curralias,%currsaml,%currvalue,@warnings, |
|
%wafproxy,%changes,%expirecache,%expiresaml); |
|
foreach my $server (sort(keys(%servers))) { |
|
my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server}); |
|
if ($serverhome eq $server) { |
|
my $serverdom = &Apache::lonnet::host_domain($server); |
|
if ($serverdom eq $dom) { |
|
$canset{$server} = 1; |
|
} |
|
} |
|
} |
|
if (ref($domconfig{'wafproxy'}) eq 'HASH') { |
|
%{$values{$dom}} = (); |
|
if (ref($domconfig{'wafproxy'}{'alias'}) eq 'HASH') { |
|
%curralias = %{$domconfig{'wafproxy'}{'alias'}}; |
|
} |
|
if (ref($domconfig{'wafproxy'}{'saml'}) eq 'HASH') { |
|
%currsaml = %{$domconfig{'wafproxy'}{'saml'}}; |
|
} |
|
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
|
$currvalue{$item} = $domconfig{'wafproxy'}{$item}; |
|
} |
|
} |
|
my $output; |
|
if (keys(%canset)) { |
|
%{$wafproxy{'alias'}} = (); |
|
%{$wafproxy{'saml'}} = (); |
|
foreach my $key (sort(keys(%canset))) { |
|
if ($env{'form.wafproxy_'.$dom}) { |
|
$wafproxy{'alias'}{$key} = $env{'form.wafproxy_alias_'.$key}; |
|
$wafproxy{'alias'}{$key} =~ s/^\s+|\s+$//g; |
|
if ($wafproxy{'alias'}{$key} ne $curralias{$key}) { |
|
$changes{'alias'} = 1; |
|
} |
|
if ($env{'form.wafproxy_alias_saml_'.$key}) { |
|
$wafproxy{'saml'}{$key} = 1; |
|
} |
|
if ($wafproxy{'saml'}{$key} ne $currsaml{$key}) { |
|
$changes{'saml'} = 1; |
|
} |
|
} else { |
|
$wafproxy{'alias'}{$key} = ''; |
|
$wafproxy{'saml'}{$key} = ''; |
|
if ($curralias{$key}) { |
|
$changes{'alias'} = 1; |
|
} |
|
if ($currsaml{$key}) { |
|
$changes{'saml'} = 1; |
|
} |
|
} |
|
if ($wafproxy{'alias'}{$key} eq '') { |
|
if ($curralias{$key}) { |
|
$expirecache{$key} = 1; |
|
} |
|
delete($wafproxy{'alias'}{$key}); |
|
} |
|
if ($wafproxy{'saml'}{$key} eq '') { |
|
if ($currsaml{$key}) { |
|
$expiresaml{$key} = 1; |
|
} |
|
delete($wafproxy{'saml'}{$key}); |
|
} |
|
} |
|
unless (keys(%{$wafproxy{'alias'}})) { |
|
delete($wafproxy{'alias'}); |
|
} |
|
unless (keys(%{$wafproxy{'saml'}})) { |
|
delete($wafproxy{'saml'}); |
|
} |
|
# Localization for values in %warn occurs in &mt() calls separately. |
|
my %warn = ( |
|
trusted => 'trusted IP range(s)', |
|
vpnint => 'internal IP range(s) for VPN sessions(s)', |
|
vpnext => 'IP range(s) for backend WAF connections', |
|
); |
|
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
|
my $possible = $env{'form.wafproxy_'.$item}; |
|
$possible =~ s/^\s+|\s+$//g; |
|
if ($possible ne '') { |
|
if ($item eq 'remoteip') { |
|
if ($possible =~ /^[mhn]$/) { |
|
$wafproxy{$item} = $possible; |
|
} |
|
} elsif ($item eq 'ipheader') { |
|
if ($wafproxy{'remoteip'} eq 'h') { |
|
$wafproxy{$item} = $possible; |
|
} |
|
} elsif ($item eq 'sslopt') { |
|
if ($possible =~ /^0|1$/) { |
|
$wafproxy{$item} = $possible; |
|
} |
|
} else { |
|
my (@ok,$count); |
|
if (($item eq 'vpnint') || ($item eq 'vpnext')) { |
|
unless ($env{'form.wafproxy_vpnaccess'}) { |
|
$possible = ''; |
|
} |
|
} elsif ($item eq 'trusted') { |
|
unless ($wafproxy{'remoteip'} eq 'h') { |
|
$possible = ''; |
|
} |
|
} |
|
unless ($possible eq '') { |
|
$possible =~ s/[\r\n]+/\s/g; |
|
$possible =~ s/\s*-\s*/-/g; |
|
$possible =~ s/\s+/,/g; |
|
$possible =~ s/,+/,/g; |
|
} |
|
$count = 0; |
|
if ($possible ne '') { |
|
foreach my $poss (split(/\,/,$possible)) { |
|
$count ++; |
|
$poss = &validate_ip_pattern($poss); |
|
if ($poss ne '') { |
|
push(@ok,$poss); |
|
} |
|
} |
|
my $diff = $count - scalar(@ok); |
|
if ($diff) { |
|
push(@warnings,'<li>'. |
|
&mt('[quant,_1,IP] invalid and excluded from saved value for [_2]', |
|
$diff,$warn{$item}). |
|
'</li>'); |
|
} |
|
if (@ok) { |
|
my @cidr_list; |
|
foreach my $item (@ok) { |
|
@cidr_list = &Net::CIDR::cidradd($item,@cidr_list); |
|
} |
|
$wafproxy{$item} = join(',',@cidr_list); |
|
} |
|
} |
|
} |
|
if ($wafproxy{$item} ne $currvalue{$item}) { |
|
$changes{$item} = 1; |
|
} |
|
} elsif ($currvalue{$item}) { |
|
$changes{$item} = 1; |
|
} |
|
} |
|
} else { |
|
if (keys(%curralias)) { |
|
$changes{'alias'} = 1; |
|
} |
|
if (keys(%currsaml)) { |
|
$changes{'saml'} = 1; |
|
} |
|
if (keys(%currvalue)) { |
|
foreach my $key (keys(%currvalue)) { |
|
$changes{$key} = 1; |
|
} |
|
} |
|
} |
|
if (keys(%changes)) { |
|
my %defaultshash = ( |
|
wafproxy => \%wafproxy, |
|
); |
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
|
$dom); |
|
if ($putresult eq 'ok') { |
|
my $cachetime = 24*60*60; |
|
my (%domdefaults,$updatedomdefs); |
|
foreach my $item ('ipheader','trusted','vpnint','vpnext','sslopt') { |
|
if ($changes{$item}) { |
|
unless ($updatedomdefs) { |
|
%domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
|
$updatedomdefs = 1; |
|
} |
|
if ($wafproxy{$item}) { |
|
$domdefaults{'waf_'.$item} = $wafproxy{$item}; |
|
} elsif (exists($domdefaults{'waf_'.$item})) { |
|
delete($domdefaults{'waf_'.$item}); |
|
} |
|
} |
|
} |
|
if ($updatedomdefs) { |
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
|
} |
|
if ((exists($wafproxy{'alias'})) || (keys(%expirecache))) { |
|
my %updates = %expirecache; |
|
foreach my $key (keys(%expirecache)) { |
|
&Apache::lonnet::devalidate_cache_new('proxyalias',$key); |
|
} |
|
if (ref($wafproxy{'alias'}) eq 'HASH') { |
|
my $cachetime = 24*60*60; |
|
foreach my $key (keys(%{$wafproxy{'alias'}})) { |
|
$updates{$key} = 1; |
|
&Apache::lonnet::do_cache_new('proxyalias',$key,$wafproxy{'alias'}{$key}, |
|
$cachetime); |
|
} |
|
} |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'proxyalias'} = \%updates; |
|
} |
|
} |
|
if ((exists($wafproxy{'saml'})) || (keys(%expiresaml))) { |
|
my %samlupdates = %expiresaml; |
|
foreach my $key (keys(%expiresaml)) { |
|
&Apache::lonnet::devalidate_cache_new('proxysaml',$key); |
|
} |
|
if (ref($wafproxy{'saml'}) eq 'HASH') { |
|
my $cachetime = 24*60*60; |
|
foreach my $key (keys(%{$wafproxy{'saml'}})) { |
|
$samlupdates{$key} = 1; |
|
&Apache::lonnet::do_cache_new('proxysaml',$key,$wafproxy{'saml'}{$key}, |
|
$cachetime); |
|
} |
|
} |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'proxysaml'} = \%samlupdates; |
|
} |
|
} |
|
$output = &mt('Changes were made to Web Application Firewall/Reverse Proxy').'<ul>'; |
|
foreach my $item ('alias','saml','remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
|
if ($changes{$item}) { |
|
if ($item eq 'alias') { |
|
my $numaliased = 0; |
|
if (ref($wafproxy{'alias'}) eq 'HASH') { |
|
my $shown; |
|
if (keys(%{$wafproxy{'alias'}})) { |
|
foreach my $server (sort(keys(%{$wafproxy{'alias'}}))) { |
|
$shown .= '<li>'.&mt('[_1] aliased by [_2]', |
|
&Apache::lonnet::hostname($server), |
|
$wafproxy{'alias'}{$server}).'</li>'; |
|
$numaliased ++; |
|
} |
|
if ($numaliased) { |
|
$output .= '<li>'.&mt('Aliases for hostnames set to: [_1]', |
|
'<ul>'.$shown.'</ul>').'</li>'; |
|
} |
|
} |
|
} |
|
unless ($numaliased) { |
|
$output .= '<li>'.&mt('Aliases deleted for hostnames').'</li>'; |
|
} |
|
} elsif ($item eq 'saml') { |
|
my $shown; |
|
if (ref($wafproxy{'saml'}) eq 'HASH') { |
|
if (keys(%{$wafproxy{'saml'}})) { |
|
$shown = join(', ',sort(keys(%{$wafproxy{'saml'}}))); |
|
} |
|
} |
|
if ($shown) { |
|
$output .= '<li>'.&mt('Alias used by SSO Auth for: [_1]', |
|
$shown).'</li>'; |
|
} else { |
|
$output .= '<li>'.&mt('No alias used for SSO Auth').'</li>'; |
|
} |
|
} else { |
|
if ($item eq 'remoteip') { |
|
my %ip_methods = &remoteip_methods(); |
|
if ($wafproxy{$item} =~ /^[mh]$/) { |
|
$output .= '<li>'.&mt("Method for determining user's IP set to: [_1]", |
|
$ip_methods{$wafproxy{$item}}).'</li>'; |
|
} else { |
|
if (($env{'form.wafproxy_'.$dom}) && (ref($wafproxy{'alias'}) eq 'HASH')) { |
|
$output .= '<li>'.&mt("No method in use to get user's real IP (will report IP used by WAF)."). |
|
'</li>'; |
|
} else { |
|
$output .= '<li>'.&mt('WAF/Reverse Proxy not in use').'</li>'; |
|
} |
|
} |
|
} elsif ($item eq 'ipheader') { |
|
if ($wafproxy{$item}) { |
|
$output .= '<li>'.&mt('Request header with remote IP set to: [_1]', |
|
$wafproxy{$item}).'</li>'; |
|
} else { |
|
$output .= '<li>'.&mt('Request header with remote IP deleted').'</li>'; |
|
} |
|
} elsif ($item eq 'trusted') { |
|
if ($wafproxy{$item}) { |
|
$output .= '<li>'.&mt('Trusted IP range(s) set to: [_1]', |
|
$wafproxy{$item}).'</li>'; |
|
} else { |
|
$output .= '<li>'.&mt('Trusted IP range(s) deleted').'</li>'; |
|
} |
|
} elsif ($item eq 'vpnint') { |
|
if ($wafproxy{$item}) { |
|
$output .= '<li>'.&mt('Internal IP Range(s) for VPN sessions set to: [_1]', |
|
$wafproxy{$item}).'</li>'; |
|
} else { |
|
$output .= '<li>'.&mt('Internal IP Range(s) for VPN sessions deleted').'</li>'; |
|
} |
|
} elsif ($item eq 'vpnext') { |
|
if ($wafproxy{$item}) { |
|
$output .= '<li>'.&mt('IP Range(s) for backend WAF connections set to: [_1]', |
|
$wafproxy{$item}).'</li>'; |
|
} else { |
|
$output .= '<li>'.&mt('IP Range(s) for backend WAF connections deleted').'</li>'; |
|
} |
|
} elsif ($item eq 'sslopt') { |
|
if ($wafproxy{$item}) { |
|
$output .= '<li>'.&mt('WAF/Reverse Proxy expected to forward requests to https on LON-CAPA node, regardless of original protocol in web browser (http or https).').'</li>'; |
|
} else { |
|
$output .= '<li>'.&mt('WAF/Reverse Proxy expected to preserve original protocol in web browser (either http or https) when forwarding to LON-CAPA node.').'</li>'; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} else { |
|
$output = '<span class="LC_error">'. |
|
&mt('An error occurred: [_1]',$putresult).'</span>'; |
|
} |
|
} elsif (keys(%canset)) { |
|
$output = &mt('No changes made to Web Application Firewall/Reverse Proxy settings'); |
|
} |
|
if (@warnings) { |
|
$output .= '<br />'.&mt('Warnings:').'<ul>'. |
|
join("\n",@warnings).'</ul>'; |
|
} |
|
return $output; |
|
} |
|
|
|
sub validate_ip_pattern { |
|
my ($pattern) = @_; |
|
if ($pattern =~ /^([^-]+)\-([^-]+)$/) { |
|
my ($start,$end) = ($1,$2); |
|
if ((&Net::CIDR::cidrvalidate($start)) && (&Net::CIDR::cidrvalidate($end))) { |
|
if (($start !~ m{/}) && ($end !~ m{/})) { |
|
return $start.'-'.$end; |
|
} |
|
} |
|
} elsif ($pattern ne '') { |
|
$pattern = &Net::CIDR::cidrvalidate($pattern); |
|
if ($pattern ne '') { |
|
return $pattern; |
|
} |
|
} |
|
return; |
|
} |
|
|
sub modify_usersessions { |
sub modify_usersessions { |
my ($dom,$lastactref,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
my @hostingtypes = ('version','excludedomain','includedomain'); |
my @hostingtypes = ('version','excludedomain','includedomain'); |
Line 10369 sub modify_usersessions {
|
Line 16791 sub modify_usersessions {
|
$changes{'spares'}{$lonhost} = \%spareschg; |
$changes{'spares'}{$lonhost} = \%spareschg; |
} |
} |
} |
} |
|
$defaultshash{'usersessions'}{'offloadnow'} = {}; |
|
$defaultshash{'usersessions'}{'offloadoth'} = {}; |
|
my @offloadnow = &Apache::loncommon::get_env_multiple('form.offloadnow'); |
|
my @okoffload; |
|
if (@offloadnow) { |
|
foreach my $server (@offloadnow) { |
|
if (&Apache::lonnet::hostname($server) ne '') { |
|
unless (grep(/^\Q$server\E$/,@okoffload)) { |
|
push(@okoffload,$server); |
|
} |
|
} |
|
} |
|
if (@okoffload) { |
|
foreach my $lonhost (@okoffload) { |
|
$defaultshash{'usersessions'}{'offloadnow'}{$lonhost} = 1; |
|
} |
|
} |
|
} |
|
my @offloadoth = &Apache::loncommon::get_env_multiple('form.offloadoth'); |
|
my @okoffloadoth; |
|
if (@offloadoth) { |
|
foreach my $server (@offloadoth) { |
|
if (&Apache::lonnet::hostname($server) ne '') { |
|
unless (grep(/^\Q$server\E$/,@okoffloadoth)) { |
|
push(@okoffloadoth,$server); |
|
} |
|
} |
|
} |
|
if (@okoffloadoth) { |
|
foreach my $lonhost (@okoffloadoth) { |
|
$defaultshash{'usersessions'}{'offloadoth'}{$lonhost} = 1; |
|
} |
|
} |
|
} |
if (ref($domconfig{'usersessions'}) eq 'HASH') { |
if (ref($domconfig{'usersessions'}) eq 'HASH') { |
if (ref($domconfig{'usersessions'}{'spares'}) eq 'HASH') { |
if (ref($domconfig{'usersessions'}{'spares'}) eq 'HASH') { |
if (ref($changes{'spares'}) eq 'HASH') { |
if (ref($changes{'spares'}) eq 'HASH') { |
Line 10380 sub modify_usersessions {
|
Line 16835 sub modify_usersessions {
|
} else { |
} else { |
$savespares = 1; |
$savespares = 1; |
} |
} |
|
foreach my $offload ('offloadnow','offloadoth') { |
|
if (ref($domconfig{'usersessions'}{$offload}) eq 'HASH') { |
|
foreach my $lonhost (keys(%{$domconfig{'usersessions'}{$offload}})) { |
|
unless ($defaultshash{'usersessions'}{$offload}{$lonhost}) { |
|
$changes{$offload} = 1; |
|
last; |
|
} |
|
} |
|
unless ($changes{$offload}) { |
|
foreach my $lonhost (keys(%{$defaultshash{'usersessions'}{$offload}})) { |
|
unless ($domconfig{'usersessions'}{$offload}{$lonhost}) { |
|
$changes{$offload} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
} else { |
|
if (($offload eq 'offloadnow') && (@okoffload)) { |
|
$changes{'offloadnow'} = 1; |
|
} |
|
if (($offload eq 'offloadoth') && (@okoffloadoth)) { |
|
$changes{'offloadoth'} = 1; |
|
} |
|
} |
|
} |
|
} else { |
|
if (@okoffload) { |
|
$changes{'offloadnow'} = 1; |
|
} |
|
if (@okoffloadoth) { |
|
$changes{'offloadoth'} = 1; |
|
} |
} |
} |
|
|
my $nochgmsg = &mt('No changes made to settings for user session hosting/offloading.'); |
my $nochgmsg = &mt('No changes made to settings for user session hosting/offloading.'); |
if ((keys(%changes) > 0) || ($savespares)) { |
if ((keys(%changes) > 0) || ($savespares)) { |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
Line 10394 sub modify_usersessions {
|
Line 16880 sub modify_usersessions {
|
if (ref($defaultshash{'usersessions'}{'hosted'}) eq 'HASH') { |
if (ref($defaultshash{'usersessions'}{'hosted'}) eq 'HASH') { |
$domdefaults{'hostedsessions'} = $defaultshash{'usersessions'}{'hosted'}; |
$domdefaults{'hostedsessions'} = $defaultshash{'usersessions'}{'hosted'}; |
} |
} |
|
if (ref($defaultshash{'usersessions'}{'offloadnow'}) eq 'HASH') { |
|
$domdefaults{'offloadnow'} = $defaultshash{'usersessions'}{'offloadnow'}; |
|
} |
|
if (ref($defaultshash{'usersessions'}{'offloadoth'}) eq 'HASH') { |
|
$domdefaults{'offloadoth'} = $defaultshash{'usersessions'}{'offloadoth'}; |
|
} |
} |
} |
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 10462 sub modify_usersessions {
|
Line 16956 sub modify_usersessions {
|
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} |
} |
} |
} |
|
if ($changes{'offloadnow'}) { |
|
if (ref($defaultshash{'usersessions'}{'offloadnow'}) eq 'HASH') { |
|
if (keys(%{$defaultshash{'usersessions'}{'offloadnow'}}) > 0) { |
|
$resulttext .= '<li>'.&mt('Switch any active user on next access, for server(s):').'<ul>'; |
|
foreach my $lonhost (sort(keys(%{$defaultshash{'usersessions'}{'offloadnow'}}))) { |
|
$resulttext .= '<li>'.$lonhost.'</li>'; |
|
} |
|
$resulttext .= '</ul>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No servers now set to switch any active user on next access.'); |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('No servers now set to switch any active user on next access.').'</li>'; |
|
} |
|
} |
|
if ($changes{'offloadoth'}) { |
|
if (ref($defaultshash{'usersessions'}{'offloadoth'}) eq 'HASH') { |
|
if (keys(%{$defaultshash{'usersessions'}{'offloadoth'}}) > 0) { |
|
$resulttext .= '<li>'.&mt('Switch other institutions on next access, for server(s):').'<ul>'; |
|
foreach my $lonhost (sort(keys(%{$defaultshash{'usersessions'}{'offloadoth'}}))) { |
|
$resulttext .= '<li>'.$lonhost.'</li>'; |
|
} |
|
$resulttext .= '</ul>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No servers now set to switch other institutions on next access.'); |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('No servers now set to switch other institutions on next access.').'</li>'; |
|
} |
|
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
$resulttext = $nochgmsg; |
$resulttext = $nochgmsg; |
Line 10483 sub modify_loadbalancing {
|
Line 17007 sub modify_loadbalancing {
|
my ($othertitle,$usertypes,$types) = |
my ($othertitle,$usertypes,$types) = |
&Apache::loncommon::sorted_inst_types($dom); |
&Apache::loncommon::sorted_inst_types($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
|
my %libraryservers = &Apache::lonnet::get_servers($dom,'library'); |
my @sparestypes = ('primary','default'); |
my @sparestypes = ('primary','default'); |
my %typetitles = &sparestype_titles(); |
my %typetitles = &sparestype_titles(); |
my $resulttext; |
my $resulttext; |
my (%currbalancer,%currtargets,%currrules,%existing); |
my (%currbalancer,%currtargets,%currrules,%existing,%currcookies); |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
%existing = %{$domconfig{'loadbalancing'}}; |
%existing = %{$domconfig{'loadbalancing'}}; |
} |
} |
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer, |
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer, |
\%currtargets,\%currrules); |
\%currtargets,\%currrules,\%currcookies); |
my ($saveloadbalancing,%defaultshash,%changes); |
my ($saveloadbalancing,%defaultshash,%changes); |
my ($alltypes,$othertypes,$titles) = |
my ($alltypes,$othertypes,$titles) = |
&loadbalancing_titles($dom,$intdom,$usertypes,$types); |
&loadbalancing_titles($dom,$intdom,$usertypes,$types); |
Line 10535 sub modify_loadbalancing {
|
Line 17060 sub modify_loadbalancing {
|
push(@offloadto,$target); |
push(@offloadto,$target); |
} |
} |
} |
} |
$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto; |
} |
|
if ($env{'form.loadbalancing_target_'.$i.'_hosthere'} eq $sparetype) { |
|
unless(grep(/^\Q$balancer\E$/,@offloadto)) { |
|
push(@offloadto,$balancer); |
|
} |
|
} |
|
$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto; |
|
} |
|
if ($env{'form.loadbalancing_cookie_'.$i}) { |
|
$defaultshash{'loadbalancing'}{$balancer}{'cookie'} = 1; |
|
if (exists($currbalancer{$balancer})) { |
|
unless ($currcookies{$balancer}) { |
|
$changes{'curr'}{$balancer}{'cookie'} = 1; |
|
} |
|
} |
|
} elsif (exists($currbalancer{$balancer})) { |
|
if ($currcookies{$balancer}) { |
|
$changes{'curr'}{$balancer}{'cookie'} = 1; |
} |
} |
} |
} |
if (ref($currtargets{$balancer}) eq 'HASH') { |
if (ref($currtargets{$balancer}) eq 'HASH') { |
Line 10574 sub modify_loadbalancing {
|
Line 17116 sub modify_loadbalancing {
|
$rule = $env{'form.loadbalancing_rules_'.$i.'_'.$type}; |
$rule = $env{'form.loadbalancing_rules_'.$i.'_'.$type}; |
} |
} |
if ($rule eq 'specific') { |
if ($rule eq 'specific') { |
$rule = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type}; |
my $specifiedhost = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type}; |
|
if (exists($servers{$specifiedhost})) { |
|
$rule = $specifiedhost; |
|
} |
} |
} |
$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type} = $rule; |
$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type} = $rule; |
if (ref($currrules{$balancer}) eq 'HASH') { |
if (ref($currrules{$balancer}) eq 'HASH') { |
Line 10596 sub modify_loadbalancing {
|
Line 17141 sub modify_loadbalancing {
|
\%defaultshash,$dom); |
\%defaultshash,$dom); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
|
my %toupdate; |
if (ref($changes{'delete'}) eq 'ARRAY') { |
if (ref($changes{'delete'}) eq 'ARRAY') { |
foreach my $balancer (sort(@{$changes{'delete'}})) { |
foreach my $balancer (sort(@{$changes{'delete'}})) { |
$resulttext .= '<li>'.&mt('Load Balancing discontinued for: [_1]',$balancer).'</li>'; |
$resulttext .= '<li>'.&mt('Load Balancing discontinued for: [_1]',$balancer).'</li>'; |
my $cachekey = &escape('loadbalancing').':'.&escape($dom); |
$toupdate{$balancer} = 1; |
&Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]); |
|
} |
} |
} |
} |
if (ref($changes{'add'}) eq 'ARRAY') { |
if (ref($changes{'add'}) eq 'ARRAY') { |
foreach my $balancer (sort(@{$changes{'add'}})) { |
foreach my $balancer (sort(@{$changes{'add'}})) { |
$resulttext .= '<li>'.&mt('Load Balancing enabled for: [_1]',$balancer); |
$resulttext .= '<li>'.&mt('Load Balancing enabled for: [_1]',$balancer); |
|
$toupdate{$balancer} = 1; |
} |
} |
} |
} |
if (ref($changes{'curr'}) eq 'HASH') { |
if (ref($changes{'curr'}) eq 'HASH') { |
foreach my $balancer (sort(keys(%{$changes{'curr'}}))) { |
foreach my $balancer (sort(keys(%{$changes{'curr'}}))) { |
|
$toupdate{$balancer} = 1; |
if (ref($changes{'curr'}{$balancer}) eq 'HASH') { |
if (ref($changes{'curr'}{$balancer}) eq 'HASH') { |
if ($changes{'curr'}{$balancer}{'targets'}) { |
if ($changes{'curr'}{$balancer}{'targets'}) { |
my %offloadstr; |
my %offloadstr; |
Line 10646 sub modify_loadbalancing {
|
Line 17193 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') || |
($rule eq 'balancer') || ($rule eq 'offloadedto')) { |
($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) { |
$balancetext = $ruletitles{$rule}; |
if (($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) { |
|
foreach my $sparetype (@sparestypes) { |
|
if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') { |
|
map { $toupdate{$_} = 1; } (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}}); |
|
} |
|
} |
|
foreach my $item (@{$alltypes}) { |
|
next if ($item =~ /^_LC_ipchange/); |
|
my $hasrule = $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$item}; |
|
if ($hasrule eq 'homeserver') { |
|
map { $toupdate{$_} = 1; } (keys(%libraryservers)); |
|
} else { |
|
unless (($hasrule eq 'default') || ($hasrule eq 'none') || ($hasrule eq 'externalbalancer')) { |
|
if ($servers{$hasrule}) { |
|
$toupdate{$hasrule} = 1; |
|
} |
|
} |
|
} |
|
} |
|
if (($rule eq 'balancer') || ($rule eq 'offloadedto')) { |
|
$balancetext = $ruletitles{$rule}; |
|
} else { |
|
my $receiver = $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type}; |
|
$balancetext = $ruletitles{'particular'}.' '.$receiver; |
|
if ($receiver) { |
|
$toupdate{$receiver}; |
|
} |
|
} |
|
} else { |
|
$balancetext = $ruletitles{$rule}; |
|
} |
} else { |
} else { |
$balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type}); |
$balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type}); |
} |
} |
Line 10656 sub modify_loadbalancing {
|
Line 17233 sub modify_loadbalancing {
|
} |
} |
} |
} |
} |
} |
my $cachekey = &escape('loadbalancing').':'.&escape($dom); |
if ($changes{'curr'}{$balancer}{'cookie'}) { |
&Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]); |
if ($currcookies{$balancer}) { |
|
$resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use disabled', |
|
$balancer).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use enabled', |
|
$balancer).'</li>'; |
|
} |
|
} |
|
} |
|
} |
|
if (keys(%toupdate)) { |
|
my %thismachine; |
|
my $updatedhere; |
|
my $cachetime = 60*60*24; |
|
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
|
foreach my $lonhost (keys(%toupdate)) { |
|
if ($thismachine{$lonhost}) { |
|
unless ($updatedhere) { |
|
&Apache::lonnet::do_cache_new('loadbalancing',$dom, |
|
$defaultshash{'loadbalancing'}, |
|
$cachetime); |
|
$updatedhere = 1; |
|
} |
|
} else { |
|
my $cachekey = &escape('loadbalancing').':'.&escape($dom); |
|
&Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]); |
|
} |
} |
} |
} |
} |
if ($resulttext ne '') { |
if ($resulttext ne '') { |
Line 10718 sub recurse_cat_deletes {
|
Line 17321 sub recurse_cat_deletes {
|
return; |
return; |
} |
} |
|
|
sub get_active_dcs { |
|
my ($dom) = @_; |
|
my $now = time; |
|
my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc'],$now,$now); |
|
my %domcoords; |
|
my $numdcs = 0; |
|
foreach my $server (keys(%dompersonnel)) { |
|
foreach my $user (sort(keys(%{$dompersonnel{$server}}))) { |
|
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user); |
|
$domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user}; |
|
} |
|
} |
|
return %domcoords; |
|
} |
|
|
|
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 10798 sub active_dc_picker {
|
Line 17386 sub active_dc_picker {
|
my ($dcname,$dcdom) = split(':',$domcoord[0]); |
my ($dcname,$dcdom) = split(':',$domcoord[0]); |
my $user = &Apache::loncommon::plainname($dcname,$dcdom); |
my $user = &Apache::loncommon::plainname($dcname,$dcdom); |
if ($inputtype eq 'radio') { |
if ($inputtype eq 'radio') { |
$table .= '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'.$user; |
$table = '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'.$user; |
if ($user ne $dcname.':'.$dcdom) { |
if ($user ne $dcname.':'.$dcdom) { |
$table .= ' ('.$dcname.':'.$dcdom.')'; |
$table .= ' ('.$dcname.':'.$dcdom.')'; |
} |
} |
Line 10807 sub active_dc_picker {
|
Line 17395 sub active_dc_picker {
|
if (exists($currhash{$domcoord[0]})) { |
if (exists($currhash{$domcoord[0]})) { |
$check = ' checked="checked"'; |
$check = ' checked="checked"'; |
} |
} |
$table .= '<span class="LC_nobreak"><label>'. |
$table = '<span class="LC_nobreak"><label>'. |
'<input type="checkbox" name="'.$name.'" '. |
'<input type="checkbox" name="'.$name.'" '. |
'value="'.$domcoord[0].'"'.$check.' />'.$user; |
'value="'.$domcoord[0].'"'.$check.' />'.$user; |
if ($user ne $dcname.':'.$dcdom) { |
if ($user ne $dcname.':'.$dcdom) { |
$table .= ' ('.$dcname.':'.$dcdom.')'; |
$table .= ' ('.$dcname.':'.$dcdom.')'; |
} |
} |
Line 10883 sub lonbalance_targets_js {
|
Line 17471 sub lonbalance_targets_js {
|
} |
} |
push(@alltypes,'default','_LC_adv','_LC_author','_LC_internetdom','_LC_external'); |
push(@alltypes,'default','_LC_adv','_LC_author','_LC_internetdom','_LC_external'); |
$allinsttypes = join("','",@alltypes); |
$allinsttypes = join("','",@alltypes); |
my (%currbalancer,%currtargets,%currrules,%existing); |
my (%currbalancer,%currtargets,%currrules,%existing,%currcookies); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
%existing = %{$settings}; |
%existing = %{$settings}; |
} |
} |
&get_loadbalancers_config($servers,\%existing,\%currbalancer, |
&get_loadbalancers_config($servers,\%existing,\%currbalancer, |
\%currtargets,\%currrules); |
\%currtargets,\%currrules,\%currcookies); |
my $balancers = join("','",sort(keys(%currbalancer))); |
my $balancers = join("','",sort(keys(%currbalancer))); |
return <<"END"; |
return <<"END"; |
|
|
Line 11299 function updateCaptcha(caller,context) {
|
Line 17887 function updateCaptcha(caller,context) {
|
var pubitem; |
var pubitem; |
var privtext; |
var privtext; |
var pubtext; |
var pubtext; |
|
var versionitem; |
|
var versiontext; |
if (document.getElementById(context+'_recaptchapub')) { |
if (document.getElementById(context+'_recaptchapub')) { |
pubitem = document.getElementById(context+'_recaptchapub'); |
pubitem = document.getElementById(context+'_recaptchapub'); |
} else { |
} else { |
Line 11319 function updateCaptcha(caller,context) {
|
Line 17909 function updateCaptcha(caller,context) {
|
} else { |
} else { |
return; |
return; |
} |
} |
|
if (document.getElementById(context+'_recaptchaversion')) { |
|
versionitem = document.getElementById(context+'_recaptchaversion'); |
|
} else { |
|
return; |
|
} |
|
if (document.getElementById(context+'_recaptchavertxt')) { |
|
versiontext = document.getElementById(context+'_recaptchavertxt'); |
|
} else { |
|
return; |
|
} |
if (caller.checked) { |
if (caller.checked) { |
if (caller.value == 'recaptcha') { |
if (caller.value == 'recaptcha') { |
pubitem.type = 'text'; |
pubitem.type = 'text'; |
Line 11327 function updateCaptcha(caller,context) {
|
Line 17927 function updateCaptcha(caller,context) {
|
privitem.size = '40'; |
privitem.size = '40'; |
pubtext.innerHTML = "$lt{'pub'}"; |
pubtext.innerHTML = "$lt{'pub'}"; |
privtext.innerHTML = "$lt{'priv'}"; |
privtext.innerHTML = "$lt{'priv'}"; |
|
versionitem.type = 'text'; |
|
versionitem.size = '3'; |
|
versiontext.innerHTML = "$lt{'ver'}"; |
} else { |
} else { |
pubitem.type = 'hidden'; |
pubitem.type = 'hidden'; |
privitem.type = 'hidden'; |
privitem.type = 'hidden'; |
|
versionitem.type = 'hidden'; |
pubtext.innerHTML = ''; |
pubtext.innerHTML = ''; |
privtext.innerHTML = ''; |
privtext.innerHTML = ''; |
|
versiontext.innerHTML = ''; |
} |
} |
} |
} |
return; |
return; |
Line 11354 function toggleDisplay(domForm,caller) {
|
Line 17959 function toggleDisplay(domForm,caller) {
|
if (document.getElementById(caller)) { |
if (document.getElementById(caller)) { |
var divitem = document.getElementById(caller); |
var divitem = document.getElementById(caller); |
var optionsElement = domForm.coursecredits; |
var optionsElement = domForm.coursecredits; |
|
var checkval = 1; |
|
var dispval = 'block'; |
|
var selfcreateRegExp = /^cancreate_emailverified/; |
if (caller == 'emailoptions') { |
if (caller == 'emailoptions') { |
optionsElement = domForm.cancreate_email; |
optionsElement = domForm.cancreate_email; |
} |
} |
|
if (caller == 'studentsubmission') { |
|
optionsElement = domForm.postsubmit; |
|
} |
|
if (caller == 'cloneinstcode') { |
|
optionsElement = domForm.canclone; |
|
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 11364 function toggleDisplay(domForm,caller) {
|
Line 17984 function toggleDisplay(domForm,caller) {
|
currval = optionsElement[i].value; |
currval = optionsElement[i].value; |
} |
} |
} |
} |
if (currval == 1) { |
if (currval == checkval) { |
divitem.style.display = 'block'; |
divitem.style.display = dispval; |
} else { |
} else { |
divitem.style.display = 'none'; |
divitem.style.display = 'none'; |
} |
} |
Line 11388 sub captcha_phrases {
|
Line 18008 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)', |
); |
); |
} |
} |
|
|
Line 11397 sub devalidate_remote_domconfs {
|
Line 18018 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'); |
my @posscached = ('domainconfig','domdefaults','usersessions', |
if (keys(%servers) > 1) { |
'directorysrch','passwdconf','cats','proxyalias','proxysaml', |
|
'ipaccess'); |
|
my %cache_by_lonhost; |
|
if (exists($cachekeys->{'samllanding'})) { |
|
if (ref($cachekeys->{'samllanding'}) eq 'HASH') { |
|
my %landing = %{$cachekeys->{'samllanding'}}; |
|
my %domservers = &Apache::lonnet::get_servers($dom); |
|
if (keys(%domservers)) { |
|
foreach my $server (keys(%domservers)) { |
|
my @cached; |
|
next if ($thismachine{$server}); |
|
if ($landing{$server}) { |
|
push(@cached,&escape('samllanding').':'.&escape($server)); |
|
} |
|
if (@cached) { |
|
$cache_by_lonhost{$server} = \@cached; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
if (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
next if ($thismachine{$server}); |
next if ($thismachine{$server}); |
my @cached; |
my @cached; |
foreach my $name (@posscached) { |
foreach my $name (@posscached) { |
if ($cachekeys->{$name}) { |
if ($cachekeys->{$name}) { |
push(@cached,&escape($name).':'.&escape($dom)); |
if (($name eq 'proxyalias') || ($name eq 'proxysaml')) { |
|
if (ref($cachekeys->{$name}) eq 'HASH') { |
|
foreach my $key (keys(%{$cachekeys->{$name}})) { |
|
push(@cached,&escape($name).':'.&escape($key)); |
|
} |
|
} |
|
} else { |
|
push(@cached,&escape($name).':'.&escape($dom)); |
|
} |
} |
} |
} |
} |
|
if ((exists($cache_by_lonhost{$server})) && |
|
(ref($cache_by_lonhost{$server}) eq 'ARRAY')) { |
|
push(@cached,@{$cache_by_lonhost{$server}}); |
|
} |
if (@cached) { |
if (@cached) { |
&Apache::lonnet::remote_devalidate_cache($server,\@cached); |
&Apache::lonnet::remote_devalidate_cache($server,\@cached); |
} |
} |