version 1.166, 2012/08/25 21:48:12
|
version 1.210, 2013/09/29 06:53:35
|
Line 45 described at http://www.lon-capa.org.
|
Line 45 described at http://www.lon-capa.org.
|
=head1 OVERVIEW |
=head1 OVERVIEW |
|
|
Each institution using LON-CAPA will typically have a single domain designated |
Each institution using LON-CAPA will typically have a single domain designated |
for use by individuals affliated with the institution. Accordingly, each domain |
for use by individuals affiliated with the institution. Accordingly, each domain |
may define a default set of logos and a color scheme which can be used to "brand" |
may define a default set of logos and a color scheme which can be used to "brand" |
the LON-CAPA instance. In addition, an institution will typically have a language |
the LON-CAPA instance. In addition, an institution will typically have a language |
and timezone which are used for the majority of courses. |
and timezone which are used for the majority of courses. |
Line 86 $dom,$settings,$rowtotal,$action.
|
Line 86 $dom,$settings,$rowtotal,$action.
|
|
|
$dom is the domain, $settings is a reference to a hash of current settings for |
$dom is the domain, $settings is a reference to a hash of current settings for |
the current context, $rowtotal is a reference to the scalar used to record the |
the current context, $rowtotal is a reference to the scalar used to record the |
number of rows displayed on the page, and $action is the context (quotas, |
number of rows displayed on the page, and $action is the context (quotas, |
requestcourses or requestauthor). |
requestcourses or requestauthor). |
|
|
The print_quotas routine was orginally created to display/store information |
The print_quotas routine was orginally created to display/store information |
Line 94 about default quota sizes for portfolio
|
Line 94 about default quota sizes for portfolio
|
institutional affiliation in the domain (e.g., Faculty, Staff, Student etc.), |
institutional affiliation in the domain (e.g., Faculty, Staff, Student etc.), |
but is now also used to manage availability of user tools: |
but is now also used to manage availability of user tools: |
i.e., blogs, aboutme page, and portfolios, and the course request tool, |
i.e., blogs, aboutme page, and portfolios, and the course request tool, |
used by course owners to request creation of a course. |
used by course owners to request creation of a course, and to display/store |
|
default quota sizes for authoring spaces. |
|
|
Outputs: 1 |
Outputs: 1 |
|
|
Line 219 sub handler {
|
Line 220 sub handler {
|
'requestcourses','requestauthor','coursecategories', |
'requestcourses','requestauthor','coursecategories', |
'serverstatuses','helpsettings', |
'serverstatuses','helpsettings', |
'coursedefaults','usersessions'); |
'coursedefaults','usersessions'); |
if (keys(%servers) > 1) { |
my %existing; |
|
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
|
%existing = %{$domconfig{'loadbalancing'}}; |
|
} |
|
if ((keys(%servers) > 1) || (keys(%existing) > 0)) { |
push(@prefs_order,'loadbalancing'); |
push(@prefs_order,'loadbalancing'); |
} |
} |
my %prefs = ( |
my %prefs = ( |
Line 238 sub handler {
|
Line 243 sub handler {
|
'login' => |
'login' => |
{ text => 'Log-in page options', |
{ text => 'Log-in page options', |
help => 'Domain_Configuration_Login_Page', |
help => 'Domain_Configuration_Login_Page', |
header => [{col1 => 'Item', |
header => [{col1 => 'Log-in Page Items', |
col2 => '',}], |
col2 => '',}, |
|
{col1 => 'Log-in Help', |
|
col2 => 'Value'}], |
}, |
}, |
|
|
'defaults' => |
'defaults' => |
{ text => 'Default authentication/language/timezone/portal', |
{ text => 'Default authentication/language/timezone/portal', |
help => 'Domain_Configuration_LangTZAuth', |
help => 'Domain_Configuration_LangTZAuth', |
Line 249 sub handler {
|
Line 255 sub handler {
|
col2 => 'Value'}], |
col2 => 'Value'}], |
}, |
}, |
'quotas' => |
'quotas' => |
{ text => 'Blogs, personal web pages, webDAV, portfolios', |
{ text => 'Blogs, personal web pages, webDAV/quotas, portfolios', |
help => 'Domain_Configuration_Quotas', |
help => 'Domain_Configuration_Quotas', |
header => [{col1 => 'User affiliation', |
header => [{col1 => 'User affiliation', |
col2 => 'Available tools', |
col2 => 'Available tools', |
col3 => 'Portfolio quota',}], |
col3 => 'Quotas, Mb; (Authoring requires role)',}], |
}, |
}, |
'autoenroll' => |
'autoenroll' => |
{ text => 'Auto-enrollment settings', |
{ text => 'Auto-enrollment settings', |
Line 354 sub handler {
|
Line 360 sub handler {
|
{text => 'Help page settings', |
{text => 'Help page settings', |
help => 'Domain_Configuration_Help_Settings', |
help => 'Domain_Configuration_Help_Settings', |
header => [{col1 => 'Help Settings (logged-in users)', |
header => [{col1 => 'Help Settings (logged-in users)', |
col2 => 'Value'}, |
|
{col1 => 'Help Settings (before log-in)', |
|
col2 => 'Value'}], |
col2 => 'Value'}], |
}, |
}, |
'coursedefaults' => |
'coursedefaults' => |
Line 383 sub handler {
|
Line 387 sub handler {
|
col2 => 'Rules'}], |
col2 => 'Rules'}], |
}, |
}, |
'loadbalancing' => |
'loadbalancing' => |
{text => 'Dedicated Load Balancer', |
{text => 'Dedicated Load Balancer(s)', |
help => 'Domain_Configuration_Load_Balancing', |
help => 'Domain_Configuration_Load_Balancing', |
header => [{col1 => 'Server', |
header => [{col1 => 'Balancers', |
col2 => 'Default destinations', |
col2 => 'Default destinations', |
col3 => 'User affliation', |
col3 => 'User affiliation', |
col4 => 'Overrides'}, |
col4 => 'Overrides'}, |
], |
], |
}, |
}, |
Line 398 sub handler {
|
Line 402 sub handler {
|
header => [{col1 => 'Log-in Service', |
header => [{col1 => 'Log-in Service', |
col2 => 'Server Setting',}, |
col2 => 'Server Setting',}, |
{col1 => 'Log-in Page Items', |
{col1 => 'Log-in Page Items', |
col2 => ''}], |
col2 => ''}, |
|
{col1 => 'Log-in Help', |
|
col2 => 'Value'}], |
}; |
}; |
} |
} |
|
|
my @roles = ('student','coordinator','author','admin'); |
my @roles = ('student','coordinator','author','admin'); |
my @actions = &Apache::loncommon::get_env_multiple('form.actions'); |
my @actions = &Apache::loncommon::get_env_multiple('form.actions'); |
&Apache::lonhtmlcommon::add_breadcrumb |
&Apache::lonhtmlcommon::add_breadcrumb |
({href=>"javascript:changePage(document.$phase,'pickactions')", |
({href=>"javascript:changePage(document.$phase,'pickactions')", |
text=>"Settings to display/modify"}); |
text=>"Settings to display/modify"}); |
my $confname = $dom.'-domainconfig'; |
my $confname = $dom.'-domainconfig'; |
|
|
if ($phase eq 'process') { |
if ($phase eq 'process') { |
&Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles); |
if (&Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order, |
|
\%prefs,\%domconfig,$confname,\@roles) eq 'update') { |
|
$r->rflush(); |
|
&devalidate_remote_domconfs($dom); |
|
} |
} elsif ($phase eq 'display') { |
} elsif ($phase eq 'display') { |
my $js = &recaptcha_js(); |
my $js = &recaptcha_js(). |
if (keys(%servers) > 1) { |
&credits_js(); |
|
if ((keys(%servers) > 1) || (keys(%existing) > 0)) { |
my ($othertitle,$usertypes,$types) = |
my ($othertitle,$usertypes,$types) = |
&Apache::loncommon::sorted_inst_types($dom); |
&Apache::loncommon::sorted_inst_types($dom); |
$js = &lonbalance_targets_js($dom,$types,\%servers). |
$js .= &lonbalance_targets_js($dom,$types,\%servers, |
&new_spares_js(). |
$domconfig{'loadbalancing'}). |
&common_domprefs_js(). |
&new_spares_js(). |
&Apache::loncommon::javascript_array_indexof(); |
&common_domprefs_js(). |
|
&Apache::loncommon::javascript_array_indexof(); |
} |
} |
&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 { |
|
# check if domconfig user exists for the domain. |
|
my $servadm = $r->dir_config('lonAdmEMail'); |
|
my ($configuserok,$author_ok,$switchserver) = |
|
&config_check($dom,$confname,$servadm); |
|
unless ($configuserok eq 'ok') { |
|
&Apache::lonconfigsettings::print_header($r,$phase,$context); |
|
$r->print(&mt('The domain configuration user "[_1]" has yet to be created.', |
|
$confname). |
|
'<br />' |
|
); |
|
if ($switchserver) { |
|
$r->print(&mt('Ordinarily, that domain configuration user is created when the ./UPDATE script is run to install LON-CAPA for the first time.'). |
|
'<br />'. |
|
&mt('However, that does not apply when new domains are added to a multi-domain server, and ./UPDATE has not been run recently.'). |
|
'<br />'. |
|
&mt('The "[_1]" user can be created automatically when a Domain Coordinator visits the web-based "Set domain configuration" screen, in a session hosted on the primary library server.',$confname). |
|
'<br />'. |
|
&mt('To do that now, use the following link: [_1]',$switchserver) |
|
); |
|
} else { |
|
$r->print(&mt('To create that user from the command line run the ./UPDATE script found in the top level directory of the extracted LON-CAPA tarball.'). |
|
'<br />'. |
|
&mt('Once that is done, you will be able to use the web-based "Set domain configuration" to configure the domain') |
|
); |
|
} |
|
$r->print(&Apache::loncommon::end_page()); |
|
return OK; |
|
} |
if (keys(%domconfig) == 0) { |
if (keys(%domconfig) == 0) { |
my $primarylibserv = &Apache::lonnet::domain($dom,'primary'); |
my $primarylibserv = &Apache::lonnet::domain($dom,'primary'); |
my @ids=&Apache::lonnet::current_machine_ids(); |
my @ids=&Apache::lonnet::current_machine_ids(); |
Line 460 sub handler {
|
Line 502 sub handler {
|
} |
} |
|
|
sub process_changes { |
sub process_changes { |
my ($r,$dom,$confname,$action,$roles,$values) = @_; |
my ($r,$dom,$confname,$action,$roles,$values,$lastactref) = @_; |
my %domconfig; |
my %domconfig; |
if (ref($values) eq 'HASH') { |
if (ref($values) eq 'HASH') { |
%domconfig = %{$values}; |
%domconfig = %{$values}; |
} |
} |
my $output; |
my $output; |
if ($action eq 'login') { |
if ($action eq 'login') { |
$output = &modify_login($r,$dom,$confname,%domconfig); |
$output = &modify_login($r,$dom,$confname,$lastactref,%domconfig); |
} elsif ($action eq 'rolecolors') { |
} elsif ($action eq 'rolecolors') { |
$output = &modify_rolecolors($r,$dom,$confname,$roles, |
$output = &modify_rolecolors($r,$dom,$confname,$roles, |
%domconfig); |
$lastactref,%domconfig); |
} elsif ($action eq 'quotas') { |
} elsif ($action eq 'quotas') { |
$output = &modify_quotas($dom,$action,%domconfig); |
$output = &modify_quotas($dom,$action,%domconfig); |
} elsif ($action eq 'autoenroll') { |
} elsif ($action eq 'autoenroll') { |
$output = &modify_autoenroll($dom,%domconfig); |
$output = &modify_autoenroll($dom,$lastactref,%domconfig); |
} elsif ($action eq 'autoupdate') { |
} elsif ($action eq 'autoupdate') { |
$output = &modify_autoupdate($dom,%domconfig); |
$output = &modify_autoupdate($dom,%domconfig); |
} elsif ($action eq 'autocreate') { |
} elsif ($action eq 'autocreate') { |
Line 486 sub process_changes {
|
Line 528 sub process_changes {
|
} 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') { |
$output = &modify_contacts($dom,%domconfig); |
$output = &modify_contacts($dom,$lastactref,%domconfig); |
} elsif ($action eq 'defaults') { |
} elsif ($action eq 'defaults') { |
$output = &modify_defaults($dom,$r); |
$output = &modify_defaults($dom,$r,%domconfig); |
} elsif ($action eq 'scantron') { |
} elsif ($action eq 'scantron') { |
$output = &modify_scantron($r,$dom,$confname,%domconfig); |
$output = &modify_scantron($r,$dom,$confname,$lastactref,%domconfig); |
} elsif ($action eq 'coursecategories') { |
} elsif ($action eq 'coursecategories') { |
$output = &modify_coursecategories($dom,%domconfig); |
$output = &modify_coursecategories($dom,%domconfig); |
} elsif ($action eq 'serverstatuses') { |
} elsif ($action eq 'serverstatuses') { |
Line 533 sub print_config_box {
|
Line 575 sub print_config_box {
|
if ($numheaders > 1) { |
if ($numheaders > 1) { |
my $colspan = ''; |
my $colspan = ''; |
my $rightcolspan = ''; |
my $rightcolspan = ''; |
if (($action eq 'rolecolors') || ($action eq 'coursecategories')) { |
if (($action eq 'rolecolors') || ($action eq 'coursecategories') || |
|
(($action eq 'login') && ($numheaders < 3))) { |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
} |
} |
if ($action eq 'usersessions') { |
if ($action eq 'usersessions') { |
Line 557 sub print_config_box {
|
Line 600 sub print_config_box {
|
} elsif ($action eq 'coursecategories') { |
} elsif ($action eq 'coursecategories') { |
$output .= &print_coursecategories('top',$dom,$item,$settings,\$rowtotal); |
$output .= &print_coursecategories('top',$dom,$item,$settings,\$rowtotal); |
} elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
$output .= &print_login('top',$dom,$confname,$phase,$settings,\$rowtotal); |
if ($numheaders == 3) { |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
|
$output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal); |
|
} else { |
|
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal); |
|
} |
} elsif ($action eq 'requestcourses') { |
} elsif ($action eq 'requestcourses') { |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
} elsif ($action eq 'requestauthor') { |
} elsif ($action eq 'requestauthor') { |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
} elsif ($action eq 'helpsettings') { |
|
$output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal); |
|
} elsif ($action eq 'usersessions') { |
} elsif ($action eq 'usersessions') { |
$output .= &print_usersessions('top',$dom,$settings,\$rowtotal); |
$output .= &print_usersessions('top',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'rolecolors') { |
} elsif ($action eq 'rolecolors') { |
Line 627 sub print_config_box {
|
Line 672 sub print_config_box {
|
} elsif ($action eq 'coursecategories') { |
} elsif ($action eq 'coursecategories') { |
$output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); |
$output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); |
} elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
$output .= &print_login('bottom',$dom,$confname,$phase,$settings,\$rowtotal); |
if ($numheaders == 3) { |
|
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
|
</table> |
|
</td> |
|
</tr> |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row"> |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col2'}).'</td> </tr>'. |
|
&print_login('help',$dom,$confname,$phase,$settings,\$rowtotal); |
|
$rowtotal ++; |
|
} else { |
|
$output .= &print_login('help',$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); |
} elsif ($action eq 'requestauthor') { |
} elsif ($action eq 'requestauthor') { |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
} elsif ($action eq 'helpsettings') { |
|
$output .= &print_helpsettings('bottom',$dom,$confname,$settings,\$rowtotal); |
|
} elsif ($action eq 'usersessions') { |
} elsif ($action eq 'usersessions') { |
$output .= &print_usersessions('middle',$dom,$settings,\$rowtotal).' |
$output .= &print_usersessions('middle',$dom,$settings,\$rowtotal).' |
</table> |
</table> |
Line 725 sub print_config_box {
|
Line 783 sub print_config_box {
|
} |
} |
$output .= '</tr>'; |
$output .= '</tr>'; |
$rowtotal ++; |
$rowtotal ++; |
if ($action eq 'login') { |
if ($action eq 'quotas') { |
$output .= &print_login('bottom',$dom,$confname,$phase,$settings, |
|
\$rowtotal); |
|
} elsif ($action eq 'quotas') { |
|
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
} elsif ($action eq 'autoenroll') { |
} elsif ($action eq 'autoenroll') { |
$output .= &print_autoenroll($dom,$settings,\$rowtotal); |
$output .= &print_autoenroll($dom,$settings,\$rowtotal); |
Line 745 sub print_config_box {
|
Line 800 sub print_config_box {
|
} elsif ($action eq 'serverstatuses') { |
} elsif ($action eq 'serverstatuses') { |
$output .= &print_serverstatuses($dom,$settings,\$rowtotal); |
$output .= &print_serverstatuses($dom,$settings,\$rowtotal); |
} elsif ($action eq 'helpsettings') { |
} elsif ($action eq 'helpsettings') { |
$output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal); |
$output .= &print_helpsettings($dom,$confname,$settings,\$rowtotal); |
} elsif ($action eq 'loadbalancing') { |
} elsif ($action eq 'loadbalancing') { |
$output .= &print_loadbalancing($dom,$settings,\$rowtotal); |
$output .= &print_loadbalancing($dom,$settings,\$rowtotal); |
} |
} |
Line 759 sub print_config_box {
|
Line 814 sub print_config_box {
|
} |
} |
|
|
sub print_login { |
sub print_login { |
my ($position,$dom,$confname,$phase,$settings,$rowtotal) = @_; |
my ($caller,$dom,$confname,$phase,$settings,$rowtotal) = @_; |
my ($css_class,$datatable); |
my ($css_class,$datatable); |
my %choices = &login_choices(); |
my %choices = &login_choices(); |
|
|
if ($position eq 'top') { |
if ($caller eq 'service') { |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my $choice = $choices{'disallowlogin'}; |
my $choice = $choices{'disallowlogin'}; |
$css_class = ' class="LC_odd_row"'; |
$css_class = ' class="LC_odd_row"'; |
Line 790 sub print_login {
|
Line 845 sub print_login {
|
'<td><select name="'.$lonhost.'_server">'. |
'<td><select name="'.$lonhost.'_server">'. |
'<option value=""'.$direct.'>'.$choices{'directlogin'}. |
'<option value=""'.$direct.'>'.$choices{'directlogin'}. |
'</option>'; |
'</option>'; |
foreach my $hostid (keys(%servers)) { |
foreach my $hostid (sort(keys(%servers))) { |
next if ($servers{$hostid} eq $servers{$lonhost}); |
next if ($servers{$hostid} eq $servers{$lonhost}); |
my $selected = ''; |
my $selected = ''; |
if (ref($disallowed{$lonhost}) eq 'HASH') { |
if (ref($disallowed{$lonhost}) eq 'HASH') { |
Line 830 sub print_login {
|
Line 885 sub print_login {
|
} |
} |
$datatable .= '</table></td></tr>'; |
$datatable .= '</table></td></tr>'; |
return $datatable; |
return $datatable; |
} |
} elsif ($caller eq 'page') { |
|
my %defaultchecked = ( |
my %defaultchecked = ( |
'coursecatalog' => 'on', |
'coursecatalog' => 'on', |
'helpdesk' => 'on', |
'adminmail' => 'off', |
'adminmail' => 'off', |
'newuser' => 'off', |
'newuser' => 'off', |
); |
); |
my @toggles = ('coursecatalog','adminmail','newuser'); |
my @toggles = ('coursecatalog','adminmail','helpdesk','newuser'); |
my (%checkedon,%checkedoff); |
my (%checkedon,%checkedoff); |
foreach my $item (@toggles) { |
|
if ($defaultchecked{$item} eq 'on') { |
|
$checkedon{$item} = ' checked="checked" '; |
|
$checkedoff{$item} = ' '; |
|
} elsif ($defaultchecked{$item} eq 'off') { |
|
$checkedoff{$item} = ' checked="checked" '; |
|
$checkedon{$item} = ' '; |
|
} |
|
} |
|
my @images = ('img','logo','domlogo','login'); |
|
my @logintext = ('textcol','bgcol'); |
|
my @bgs = ('pgbg','mainbg','sidebg'); |
|
my @links = ('link','alink','vlink'); |
|
my %designhash = &Apache::loncommon::get_domainconf($dom); |
|
my %defaultdesign = %Apache::loncommon::defaultdesign; |
|
my (%is_custom,%designs); |
|
my %defaults = ( |
|
font => $defaultdesign{'login.font'}, |
|
); |
|
foreach my $item (@images) { |
|
$defaults{$item} = $defaultdesign{'login.'.$item}; |
|
$defaults{'showlogo'}{$item} = 1; |
|
} |
|
foreach my $item (@bgs) { |
|
$defaults{'bgs'}{$item} = $defaultdesign{'login.'.$item}; |
|
} |
|
foreach my $item (@logintext) { |
|
$defaults{'logintext'}{$item} = $defaultdesign{'login.'.$item}; |
|
} |
|
foreach my $item (@links) { |
|
$defaults{'links'}{$item} = $defaultdesign{'login.'.$item}; |
|
} |
|
if (ref($settings) eq 'HASH') { |
|
foreach my $item (@toggles) { |
foreach my $item (@toggles) { |
if ($settings->{$item} eq '1') { |
if ($defaultchecked{$item} eq 'on') { |
$checkedon{$item} = ' checked="checked" '; |
$checkedon{$item} = ' checked="checked" '; |
$checkedoff{$item} = ' '; |
$checkedoff{$item} = ' '; |
} elsif ($settings->{$item} eq '0') { |
} elsif ($defaultchecked{$item} eq 'off') { |
$checkedoff{$item} = ' checked="checked" '; |
$checkedoff{$item} = ' checked="checked" '; |
$checkedon{$item} = ' '; |
$checkedon{$item} = ' '; |
} |
} |
} |
} |
|
my @images = ('img','logo','domlogo','login'); |
|
my @logintext = ('textcol','bgcol'); |
|
my @bgs = ('pgbg','mainbg','sidebg'); |
|
my @links = ('link','alink','vlink'); |
|
my %designhash = &Apache::loncommon::get_domainconf($dom); |
|
my %defaultdesign = %Apache::loncommon::defaultdesign; |
|
my (%is_custom,%designs); |
|
my %defaults = ( |
|
font => $defaultdesign{'login.font'}, |
|
); |
foreach my $item (@images) { |
foreach my $item (@images) { |
if (defined($settings->{$item})) { |
$defaults{$item} = $defaultdesign{'login.'.$item}; |
$designs{$item} = $settings->{$item}; |
$defaults{'showlogo'}{$item} = 1; |
$is_custom{$item} = 1; |
} |
} |
foreach my $item (@bgs) { |
if (defined($settings->{'showlogo'}{$item})) { |
$defaults{'bgs'}{$item} = $defaultdesign{'login.'.$item}; |
$designs{'showlogo'}{$item} = $settings->{'showlogo'}{$item}; |
|
} |
|
} |
} |
foreach my $item (@logintext) { |
foreach my $item (@logintext) { |
if ($settings->{$item} ne '') { |
$defaults{'logintext'}{$item} = $defaultdesign{'login.'.$item}; |
$designs{'logintext'}{$item} = $settings->{$item}; |
|
$is_custom{$item} = 1; |
|
} |
|
} |
} |
if ($settings->{'font'} ne '') { |
foreach my $item (@links) { |
$designs{'font'} = $settings->{'font'}; |
$defaults{'links'}{$item} = $defaultdesign{'login.'.$item}; |
$is_custom{'font'} = 1; |
|
} |
} |
foreach my $item (@bgs) { |
if (ref($settings) eq 'HASH') { |
if ($settings->{$item} ne '') { |
foreach my $item (@toggles) { |
$designs{'bgs'}{$item} = $settings->{$item}; |
if ($settings->{$item} eq '1') { |
$is_custom{$item} = 1; |
$checkedon{$item} = ' checked="checked" '; |
|
$checkedoff{$item} = ' '; |
|
} elsif ($settings->{$item} eq '0') { |
|
$checkedoff{$item} = ' checked="checked" '; |
|
$checkedon{$item} = ' '; |
|
} |
} |
} |
} |
foreach my $item (@images) { |
foreach my $item (@links) { |
if (defined($settings->{$item})) { |
if ($settings->{$item} ne '') { |
$designs{$item} = $settings->{$item}; |
$designs{'links'}{$item} = $settings->{$item}; |
$is_custom{$item} = 1; |
$is_custom{$item} = 1; |
} |
|
if (defined($settings->{'showlogo'}{$item})) { |
|
$designs{'showlogo'}{$item} = $settings->{'showlogo'}{$item}; |
|
} |
|
} |
|
foreach my $item (@logintext) { |
|
if ($settings->{$item} ne '') { |
|
$designs{'logintext'}{$item} = $settings->{$item}; |
|
$is_custom{$item} = 1; |
|
} |
|
} |
|
if ($settings->{'font'} ne '') { |
|
$designs{'font'} = $settings->{'font'}; |
|
$is_custom{'font'} = 1; |
|
} |
|
foreach my $item (@bgs) { |
|
if ($settings->{$item} ne '') { |
|
$designs{'bgs'}{$item} = $settings->{$item}; |
|
$is_custom{$item} = 1; |
|
} |
|
} |
|
foreach my $item (@links) { |
|
if ($settings->{$item} ne '') { |
|
$designs{'links'}{$item} = $settings->{$item}; |
|
$is_custom{$item} = 1; |
|
} |
|
} |
|
} else { |
|
if ($designhash{$dom.'.login.font'} ne '') { |
|
$designs{'font'} = $designhash{$dom.'.login.font'}; |
|
$is_custom{'font'} = 1; |
|
} |
|
foreach my $item (@images) { |
|
if ($designhash{$dom.'.login.'.$item} ne '') { |
|
$designs{$item} = $designhash{$dom.'.login.'.$item}; |
|
$is_custom{$item} = 1; |
|
} |
|
} |
|
foreach my $item (@bgs) { |
|
if ($designhash{$dom.'.login.'.$item} ne '') { |
|
$designs{'bgs'}{$item} = $designhash{$dom.'.login.'.$item}; |
|
$is_custom{$item} = 1; |
|
} |
|
} |
|
foreach my $item (@links) { |
|
if ($designhash{$dom.'.login.'.$item} ne '') { |
|
$designs{'links'}{$item} = $designhash{$dom.'.login.'.$item}; |
|
$is_custom{$item} = 1; |
|
} |
} |
} |
} |
} |
} else { |
my %alt_text = &Apache::lonlocal::texthash ( img => 'Log-in banner', |
if ($designhash{$dom.'.login.font'} ne '') { |
logo => 'Institution Logo', |
$designs{'font'} = $designhash{$dom.'.login.font'}; |
domlogo => 'Domain Logo', |
$is_custom{'font'} = 1; |
login => 'Login box'); |
|
my $itemcount = 1; |
|
foreach my $item (@toggles) { |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= |
|
'<tr'.$css_class.'><td colspan="2">'.$choices{$item}. |
|
'</td><td>'. |
|
'<span class="LC_nobreak"><label><input type="radio" name="'. |
|
$item.'"'.$checkedon{$item}.' value="1" />'.&mt('Yes'). |
|
'</label> <label><input type="radio" name="'.$item.'"'. |
|
$checkedoff{$item}.' value="0" />'.&mt('No').'</label></span></td>'. |
|
'</tr>'; |
|
$itemcount ++; |
} |
} |
foreach my $item (@images) { |
$datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext); |
if ($designhash{$dom.'.login.'.$item} ne '') { |
$datatable .= '</tr></table></td></tr>'; |
$designs{$item} = $designhash{$dom.'.login.'.$item}; |
} elsif ($caller eq 'help') { |
$is_custom{$item} = 1; |
my ($defaulturl,$defaulttype,%url,%type,%lt,%langchoices); |
|
my $switchserver = &check_switchserver($dom,$confname); |
|
my $itemcount = 1; |
|
$defaulturl = '/adm/loginproblems.html'; |
|
$defaulttype = 'default'; |
|
%lt = &Apache::lonlocal::texthash ( |
|
del => 'Delete?', |
|
rep => 'Replace:', |
|
upl => 'Upload:', |
|
default => 'Default', |
|
custom => 'Custom', |
|
); |
|
%langchoices = &Apache::lonlocal::texthash(&get_languages_hash()); |
|
my @currlangs; |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{'helpurl'}) eq 'HASH') { |
|
foreach my $key (sort(keys(%{$settings->{'helpurl'}}))) { |
|
next if ($settings->{'helpurl'}{$key} eq ''); |
|
$url{$key} = $settings->{'helpurl'}{$key}.'?inhibitmenu=yes'; |
|
$type{$key} = 'custom'; |
|
unless ($key eq 'nolang') { |
|
push(@currlangs,$key); |
|
} |
|
} |
|
} elsif ($settings->{'helpurl'} ne '') { |
|
$type{'nolang'} = 'custom'; |
|
$url{'nolang'} = $settings->{'helpurl'}.'?inhibitmenu=yes'; |
} |
} |
} |
} |
foreach my $item (@bgs) { |
foreach my $lang ('nolang',sort(@currlangs)) { |
if ($designhash{$dom.'.login.'.$item} ne '') { |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$designs{'bgs'}{$item} = $designhash{$dom.'.login.'.$item}; |
$datatable .= '<tr'.$css_class.'>'; |
$is_custom{$item} = 1; |
if ($url{$lang} eq '') { |
|
$url{$lang} = $defaulturl; |
|
} |
|
if ($type{$lang} eq '') { |
|
$type{$lang} = $defaulttype; |
|
} |
|
$datatable .= '<td colspan="2"><span class="LC_nobreak">'; |
|
if ($lang eq 'nolang') { |
|
$datatable .= &mt('Log-in help page if no specific language file: [_1]', |
|
&Apache::loncommon::modal_link($url{$lang},$lt{$type{$lang}},600,500)); |
|
} else { |
|
$datatable .= &mt('Log-in help page for language: [_1] is [_2]', |
|
$langchoices{$lang}, |
|
&Apache::loncommon::modal_link($url{$lang},$lt{$type{$lang}},600,500)); |
|
} |
|
$datatable .= '</span></td>'."\n". |
|
'<td class="LC_left_item">'; |
|
if ($type{$lang} eq 'custom') { |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="loginhelpurl_del" value="'.$lang.'" />'. |
|
$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="loginhelpurl_'.$lang.'" />'; |
} |
} |
|
$datatable .= '</td></tr>'; |
|
$itemcount ++; |
} |
} |
foreach my $item (@links) { |
my @addlangs; |
if ($designhash{$dom.'.login.'.$item} ne '') { |
foreach my $lang (sort(keys(%langchoices))) { |
$designs{'links'}{$item} = $designhash{$dom.'.login.'.$item}; |
next if ((grep(/^\Q$lang\E$/,@currlangs)) || ($lang eq 'x_chef')); |
$is_custom{$item} = 1; |
push(@addlangs,$lang); |
|
} |
|
if (@addlangs > 0) { |
|
my %toadd; |
|
map { $toadd{$_} = $langchoices{$_} ; } @addlangs; |
|
$toadd{''} = &mt('Select'); |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '<tr'.$css_class.'><td class="LC_left_item" colspan="2">'. |
|
&mt('Add log-in help page for a specific language:').' '. |
|
&Apache::loncommon::select_form('','loginhelpurl_add_lang',\%toadd). |
|
'</td><td class="LC_left_item">'.$lt{'upl'}.'<br />'; |
|
if ($switchserver) { |
|
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
|
} else { |
|
$datatable .= '<input type="file" name="loginhelpurl_add_file" />'; |
} |
} |
|
$datatable .= '</td></tr>'; |
|
$itemcount ++; |
} |
} |
|
$datatable .= &captcha_choice('login',$settings,$itemcount); |
} |
} |
my %alt_text = &Apache::lonlocal::texthash ( img => 'Log-in banner', |
|
logo => 'Institution Logo', |
|
domlogo => 'Domain Logo', |
|
login => 'Login box'); |
|
my $itemcount = 1; |
|
foreach my $item (@toggles) { |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= |
|
'<tr'.$css_class.'><td colspan="2">'.$choices{$item}. |
|
'</td><td>'. |
|
'<span class="LC_nobreak"><label><input type="radio" name="'. |
|
$item.'"'.$checkedon{$item}.' value="1" />'.&mt('Yes'). |
|
'</label> <label><input type="radio" name="'.$item.'"'. |
|
$checkedoff{$item}.' value="0" />'.&mt('No').'</label></span></td>'. |
|
'</tr>'; |
|
$itemcount ++; |
|
} |
|
$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>'; |
|
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 963 sub login_choices {
|
Line 1108 sub login_choices {
|
&Apache::lonlocal::texthash ( |
&Apache::lonlocal::texthash ( |
coursecatalog => 'Display Course/Community Catalog link?', |
coursecatalog => 'Display Course/Community Catalog link?', |
adminmail => "Display Administrator's E-mail Address?", |
adminmail => "Display Administrator's E-mail Address?", |
|
helpdesk => 'Display "Contact Helpdesk" link', |
disallowlogin => "Login page requests redirected", |
disallowlogin => "Login page requests redirected", |
hostid => "Server", |
hostid => "Server", |
server => "Redirect to:", |
server => "Redirect to:", |
Line 1000 sub print_rolecolors {
|
Line 1146 sub print_rolecolors {
|
my %designhash = &Apache::loncommon::get_domainconf($dom); |
my %designhash = &Apache::loncommon::get_domainconf($dom); |
my %defaultdesign = %Apache::loncommon::defaultdesign; |
my %defaultdesign = %Apache::loncommon::defaultdesign; |
my (%is_custom,%designs); |
my (%is_custom,%designs); |
my %defaults = ( |
my %defaults = &role_defaults($role,\@bgs,\@links,\@images); |
img => $defaultdesign{$role.'.img'}, |
|
font => $defaultdesign{$role.'.font'}, |
|
fontmenu => $defaultdesign{$role.'.fontmenu'}, |
|
); |
|
foreach my $item (@bgs) { |
|
$defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item}; |
|
} |
|
foreach my $item (@links) { |
|
$defaults{'links'}{$item} = $defaultdesign{$role.'.'.$item}; |
|
} |
|
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{$role}) eq 'HASH') { |
if (ref($settings->{$role}) eq 'HASH') { |
if ($settings->{$role}->{'img'} ne '') { |
if ($settings->{$role}->{'img'} ne '') { |
Line 1071 sub print_rolecolors {
|
Line 1207 sub print_rolecolors {
|
return $datatable; |
return $datatable; |
} |
} |
|
|
|
sub role_defaults { |
|
my ($role,$bgs,$links,$images,$logintext) = @_; |
|
my %defaults; |
|
unless ((ref($bgs) eq 'ARRAY') && (ref($links) eq 'ARRAY') && (ref($images) eq 'ARRAY')) { |
|
return %defaults; |
|
} |
|
my %defaultdesign = %Apache::loncommon::defaultdesign; |
|
if ($role eq 'login') { |
|
%defaults = ( |
|
font => $defaultdesign{$role.'.font'}, |
|
); |
|
if (ref($logintext) eq 'ARRAY') { |
|
foreach my $item (@{$logintext}) { |
|
$defaults{'logintext'}{$item} = $defaultdesign{$role.'.'.$item}; |
|
} |
|
} |
|
foreach my $item (@{$images}) { |
|
$defaults{'showlogo'}{$item} = 1; |
|
} |
|
} else { |
|
%defaults = ( |
|
img => $defaultdesign{$role.'.img'}, |
|
font => $defaultdesign{$role.'.font'}, |
|
fontmenu => $defaultdesign{$role.'.fontmenu'}, |
|
); |
|
} |
|
foreach my $item (@{$bgs}) { |
|
$defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item}; |
|
} |
|
foreach my $item (@{$links}) { |
|
$defaults{'links'}{$item} = $defaultdesign{$role.'.'.$item}; |
|
} |
|
foreach my $item (@{$images}) { |
|
$defaults{$item} = $defaultdesign{$role.'.'.$item}; |
|
} |
|
return %defaults; |
|
} |
|
|
sub display_color_options { |
sub display_color_options { |
my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs, |
my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs, |
$images,$bgs,$links,$alt_text,$rowtotal,$logintext) = @_; |
$images,$bgs,$links,$alt_text,$rowtotal,$logintext) = @_; |
Line 1083 sub display_color_options {
|
Line 1257 sub display_color_options {
|
} else { |
} else { |
$datatable .= '<td> </td>'; |
$datatable .= '<td> </td>'; |
} |
} |
my $fontlink = &color_pick($phase,$role,'font',$choices->{'font'},$designs->{'font'}); |
my $current_color = $designs->{'font'} ? $designs->{'font'} : $defaults->{'font'}; |
|
|
$datatable .= '<td><span class="LC_nobreak">'. |
$datatable .= '<td><span class="LC_nobreak">'. |
'<input type="text" size="10" name="'.$role.'_font"'. |
'<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'. |
' value="'.$designs->{'font'}.'" /> '.$fontlink. |
' value="'.$current_color.'" /> '. |
' <span id="css_'.$role.'_font" style="background-color: '. |
' </td></tr>'; |
$designs->{'font'}.';"> </span>'. |
|
'</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>'; |
Line 1098 sub display_color_options {
|
Line 1271 sub display_color_options {
|
} else { |
} else { |
$datatable .= '<td> </td>'; |
$datatable .= '<td> </td>'; |
} |
} |
$fontlink = &color_pick($phase,$role,'fontmenu',$choices->{'fontmenu'},$designs->{'fontmenu'}); |
$current_color = $designs->{'fontmenu'} ? |
|
$designs->{'fontmenu'} : $defaults->{'fontmenu'}; |
$datatable .= '<td><span class="LC_nobreak">'. |
$datatable .= '<td><span class="LC_nobreak">'. |
'<input type="text" size="10" name="'.$role.'_fontmenu"'. |
'<input class="colorchooser" type="text" size="10" name="' |
' value="'.$designs->{'fontmenu'}.'" /> '.$fontlink. |
.$role.'_fontmenu"'. |
' <span id="css_'.$role.'_fontmenu" style="background-color: '. |
' value="'.$current_color.'" /> '. |
$designs->{'fontmenu'}.';"> </span>'. |
' </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 1119 sub display_color_options {
|
Line 1292 sub display_color_options {
|
&login_header_options($img,$role,$defaults,$is_custom,$choices); |
&login_header_options($img,$role,$defaults,$is_custom,$choices); |
$logincolors = |
$logincolors = |
&login_text_colors($img,$role,$logintext,$phase,$choices, |
&login_text_colors($img,$role,$logintext,$phase,$choices, |
$designs); |
$designs,$defaults); |
} elsif ($img ne 'domlogo') { |
} elsif ($img ne 'domlogo') { |
$datatable.= &logo_display_options($img,$defaults,$designs); |
$datatable.= &logo_display_options($img,$defaults,$designs); |
} |
} |
Line 1198 sub display_color_options {
|
Line 1371 sub display_color_options {
|
$datatable .= &image_changes($is_custom->{$img},$alt_text->{$img},$img_import, |
$datatable .= &image_changes($is_custom->{$img},$alt_text->{$img},$img_import, |
$showfile,$fullsize,$role,$img,$imgfile,$logincolors); |
$showfile,$fullsize,$role,$img,$imgfile,$logincolors); |
} else { |
} else { |
$datatable .= '<td colspan="2" class="LC_right_item"><br />'. |
$datatable .= '<td> </td><td class="LC_left_item">'. |
&mt('Upload:'); |
&mt('Upload:').'<br />'; |
} |
} |
} else { |
} else { |
$datatable .= '<td colspan="2" class="LC_right_item"><br />'. |
$datatable .= '<td> </td><td class="LC_left_item">'. |
&mt('Upload:'); |
&mt('Upload:').'<br />'; |
} |
} |
if ($switchserver) { |
if ($switchserver) { |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
Line 1231 sub display_color_options {
|
Line 1404 sub display_color_options {
|
} |
} |
$datatable .= '<td class="LC_right_item">'. |
$datatable .= '<td class="LC_right_item">'. |
'<table border="0"><tr>'; |
'<table border="0"><tr>'; |
|
|
foreach my $item (@{$bgs}) { |
foreach my $item (@{$bgs}) { |
my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'bgs'}{$item}); |
$datatable .= '<td align="center">'.$choices->{$item}; |
$datatable .= '<td align="center">'.$link; |
my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item}; |
if ($designs->{'bgs'}{$item}) { |
if ($designs->{'bgs'}{$item}) { |
$datatable .= ' <span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'bgs'}{$item}.';"> </span>'; |
$datatable .= ' '; |
} |
} |
$datatable .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'.$designs->{'bgs'}{$item}. |
$datatable .= '<br /><input type="text" class="colorchooser" size="8" name="'.$role.'_'.$item.'" value="'.$color. |
'" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>'; |
'" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>'; |
} |
} |
$datatable .= '</tr></table></td></tr>'; |
$datatable .= '</tr></table></td></tr>'; |
Line 1259 sub display_color_options {
|
Line 1433 sub display_color_options {
|
$datatable .= '<td class="LC_right_item">'. |
$datatable .= '<td class="LC_right_item">'. |
'<table border="0"><tr>'; |
'<table border="0"><tr>'; |
foreach my $item (@{$links}) { |
foreach my $item (@{$links}) { |
$datatable .= '<td align="center">'."\n". |
my $color = $designs->{'link'}{$item} ? $designs->{'link'}{$item} : $defaults->{'links'}{$item}; |
&color_pick($phase,$role,$item,$choices->{$item}, |
$datatable .= '<td align="center">'.$choices->{$item}."\n"; |
$designs->{'links'}{$item}); |
|
if ($designs->{'links'}{$item}) { |
if ($designs->{'links'}{$item}) { |
$datatable.=' <span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'links'}{$item}.';"> </span>'; |
$datatable.=' '; |
} |
} |
$datatable .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'.$designs->{'links'}{$item}. |
$datatable .= '<br /><input type="text" size="8" class="colorchooser" name="'.$role.'_'.$item.'" value="'.$color. |
'" /></td>'; |
'" /></td>'; |
} |
} |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
Line 1319 sub login_header_options {
|
Line 1492 sub login_header_options {
|
} |
} |
|
|
sub login_text_colors { |
sub login_text_colors { |
my ($img,$role,$logintext,$phase,$choices,$designs) = @_; |
my ($img,$role,$logintext,$phase,$choices,$designs,$defaults) = @_; |
my $color_menu = '<table border="0"><tr>'; |
my $color_menu = '<table border="0"><tr>'; |
foreach my $item (@{$logintext}) { |
foreach my $item (@{$logintext}) { |
my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'logintext'}{$item}); |
$color_menu .= '<td align="center">'.$choices->{$item}; |
$color_menu .= '<td align="center">'.$link; |
my $color = $designs->{'logintext'}{$item} ? $designs->{'logintext'}{$item} : $defaults->{'logintext'}{$item}; |
if ($designs->{'logintext'}{$item}) { |
$color_menu .= '<br /><input type="text" class="colorchooser" size="8" name="'.$role.'_'.$item.'" value="'.$color. |
$color_menu .= ' <span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'logintext'}{$item}.';"> </span>'; |
'" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>'; |
} |
|
$color_menu .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'. |
|
$designs->{'logintext'}{$item}.'" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>'. |
|
'<td> </td>'; |
|
} |
} |
$color_menu .= '</tr></table><br />'; |
$color_menu .= '</tr></table><br />'; |
return $color_menu; |
return $color_menu; |
Line 1361 sub image_changes {
|
Line 1530 sub image_changes {
|
$role.'_del_'.$img.'" value="1" />'.&mt('Delete?'). |
$role.'_del_'.$img.'" value="1" />'.&mt('Delete?'). |
'</label> '.&mt('Replace:').'</span><br />'; |
'</label> '.&mt('Replace:').'</span><br />'; |
} else { |
} else { |
$output .= '<td valign="bottom">'.$logincolors.&mt('Upload:').'<br />'; |
$output .= '<td valign="middle">'.$logincolors.&mt('Upload:').'<br />'; |
} |
} |
} |
} |
return $output; |
return $output; |
} |
} |
|
|
sub color_pick { |
|
my ($phase,$role,$item,$desc,$curcol) = @_; |
|
my $link = '<a href="javascript:pjump('."'color_custom','".$desc. |
|
"','".$curcol."','".$role.'_'.$item."','parmform.pres','psub'". |
|
');">'.$desc.'</a>'; |
|
return $link; |
|
} |
|
|
|
sub print_quotas { |
sub print_quotas { |
my ($dom,$settings,$rowtotal,$action) = @_; |
my ($dom,$settings,$rowtotal,$action) = @_; |
my $context; |
my $context; |
Line 1383 sub print_quotas {
|
Line 1544 sub print_quotas {
|
} else { |
} else { |
$context = $action; |
$context = $action; |
} |
} |
my ($datatable,$defaultquota,@usertools,@options,%validations); |
my ($datatable,$defaultquota,$authorquota,@usertools,@options,%validations); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my $typecount = 0; |
my $typecount = 0; |
my ($css_class,%titles); |
my ($css_class,%titles); |
Line 1395 sub print_quotas {
|
Line 1556 sub print_quotas {
|
} elsif ($context eq 'requestauthor') { |
} elsif ($context eq 'requestauthor') { |
@usertools = ('author'); |
@usertools = ('author'); |
@options = ('norequest','approval','automatic'); |
@options = ('norequest','approval','automatic'); |
%titles = &authorrequest_titles(); |
%titles = &authorrequest_titles(); |
} else { |
} else { |
@usertools = ('aboutme','blog','webdav','portfolio'); |
@usertools = ('aboutme','blog','webdav','portfolio'); |
%titles = &tool_titles(); |
%titles = &tool_titles(); |
} |
} |
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
foreach my $type (@{$types}) { |
foreach my $type (@{$types}) { |
my $currdefquota; |
my ($currdefquota,$currauthorquota); |
unless (($context eq 'requestcourses') || |
unless (($context eq 'requestcourses') || |
($context eq 'requestauthor')) { |
($context eq 'requestauthor')) { |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{defaultquota}) eq 'HASH') { |
if (ref($settings->{defaultquota}) eq 'HASH') { |
$currdefquota = $settings->{defaultquota}->{$type}; |
$currdefquota = $settings->{defaultquota}->{$type}; |
} else { |
} else { |
$currdefquota = $settings->{$type}; |
$currdefquota = $settings->{$type}; |
} |
} |
|
if (ref($settings->{authorquota}) eq 'HASH') { |
|
$currauthorquota = $settings->{authorquota}->{$type}; |
|
} |
} |
} |
} |
} |
if (defined($usertypes->{$type})) { |
if (defined($usertypes->{$type})) { |
Line 1524 sub print_quotas {
|
Line 1688 sub print_quotas {
|
unless (($context eq 'requestcourses') || |
unless (($context eq 'requestcourses') || |
($context eq 'requestauthor')) { |
($context eq 'requestauthor')) { |
$datatable .= |
$datatable .= |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
'<td class="LC_right_item">'. |
|
'<span class="LC_nobreak">'.&mt('Portfolio').': '. |
'<input type="text" name="quota_'.$type. |
'<input type="text" name="quota_'.$type. |
'" value="'.$currdefquota. |
'" value="'.$currdefquota. |
'" size="5" /> Mb</span></td>'; |
'" size="5" /></span>'.(' ' x 2). |
|
'<span class="LC_nobreak">'.&mt('Authoring').': '. |
|
'<input type="text" name="authorquota_'.$type. |
|
'" value="'.$currauthorquota. |
|
'" size="5" /></span></td>'; |
} |
} |
$datatable .= '</tr>'; |
$datatable .= '</tr>'; |
} |
} |
Line 1535 sub print_quotas {
|
Line 1704 sub print_quotas {
|
} |
} |
unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) { |
unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) { |
$defaultquota = '20'; |
$defaultquota = '20'; |
|
$authorquota = '500'; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'defaultquota'}) eq 'HASH') { |
if (ref($settings->{'defaultquota'}) eq 'HASH') { |
$defaultquota = $settings->{'defaultquota'}->{'default'}; |
$defaultquota = $settings->{'defaultquota'}->{'default'}; |
} elsif (defined($settings->{'default'})) { |
} elsif (defined($settings->{'default'})) { |
$defaultquota = $settings->{'default'}; |
$defaultquota = $settings->{'default'}; |
} |
} |
|
if (ref($settings->{'authorquota'}) eq 'HASH') { |
|
$authorquota = $settings->{'authorquota'}->{'default'}; |
|
} |
} |
} |
} |
} |
$typecount ++; |
$typecount ++; |
Line 1606 sub print_quotas {
|
Line 1779 sub print_quotas {
|
} elsif ($context eq 'requestauthor') { |
} elsif ($context eq 'requestauthor') { |
my $curroption; |
my $curroption; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'requestauthor'}) eq 'HASH') { |
$curroption = $settings->{'default'}; |
$curroption = $settings->{'requestauthor'}; |
|
} |
|
} |
} |
if (!$curroption) { |
if (!$curroption) { |
$curroption = 'norequest'; |
$curroption = 'norequest'; |
Line 1653 sub print_quotas {
|
Line 1824 sub print_quotas {
|
} |
} |
$datatable .= '</td>'; |
$datatable .= '</td>'; |
unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) { |
unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) { |
$datatable .= '<td class="LC_right_item"><span class="LC_nobreak">'. |
$datatable .= '<td class="LC_right_item">'. |
|
'<span class="LC_nobreak">'.&mt('Portfolio').': '. |
'<input type="text" name="defaultquota" value="'. |
'<input type="text" name="defaultquota" value="'. |
$defaultquota.'" size="5" /> Mb</span></td>'; |
$defaultquota.'" size="5" /></span>'.(' ' x2). |
|
'<span class="LC_nobreak">'.&mt('Authoring').': '. |
|
'<input type="text" name="authorquota" value="'. |
|
$authorquota.'" size="5" /></span></td>'; |
} |
} |
$datatable .= '</tr>'; |
$datatable .= '</tr>'; |
$typecount ++; |
$typecount ++; |
$css_class = $typecount%2?' class="LC_odd_row"':''; |
$css_class = $typecount%2?' class="LC_odd_row"':''; |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td>'.&mt('LON-CAPA Advanced Users').' '; |
'<td>'.&mt('LON-CAPA Advanced Users').'<br />'; |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
$datatable .= &mt('(overrides affiliation, if set)'). |
$datatable .= &mt('(overrides affiliation, if set)'). |
'</td>'. |
'</td>'. |
Line 1753 sub print_quotas {
|
Line 1928 sub print_quotas {
|
$checked = ' checked="checked"'; |
$checked = ' checked="checked"'; |
} |
} |
$datatable .= '<span class="LC_nobreak"><label>'. |
$datatable .= '<span class="LC_nobreak"><label>'. |
'<input type="radio" name="crsreq_'.$item. |
'<input type="radio" name="authorreq__LC_adv"'. |
'__LC_adv" value="'.$val.'"'.$checked.' />'. |
' value="'.$val.'"'.$checked.' />'. |
$titles{$option}.'</label></span> '; |
$titles{$option}.'</label></span> '; |
} |
} |
} else { |
} else { |
Line 1788 sub print_quotas {
|
Line 1963 sub print_quotas {
|
|
|
sub print_requestmail { |
sub print_requestmail { |
my ($dom,$action,$settings,$rowtotal) = @_; |
my ($dom,$action,$settings,$rowtotal) = @_; |
my ($now,$datatable,%dompersonnel,@domcoord,@currapproval,$rows); |
my ($now,$datatable,%currapp); |
$now = time; |
$now = time; |
$rows = 0; |
|
%dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc'],$now,$now); |
|
foreach my $server (keys(%dompersonnel)) { |
|
foreach my $user (sort(keys(%{$dompersonnel{$server}}))) { |
|
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user); |
|
if (!grep(/^$uname:$udom$/,@domcoord)) { |
|
push(@domcoord,$uname.':'.$udom); |
|
} |
|
} |
|
} |
|
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'notify'}) eq 'HASH') { |
if (ref($settings->{'notify'}) eq 'HASH') { |
if ($settings->{'notify'}{'approval'} ne '') { |
if ($settings->{'notify'}{'approval'} ne '') { |
@currapproval = split(',',$settings->{'notify'}{'approval'}); |
map {$currapp{$_}=1;} split(/,/,$settings->{'notify'}{'approval'}); |
} |
|
} |
|
} |
|
if (@currapproval) { |
|
foreach my $dc (@currapproval) { |
|
unless (grep(/^\Q$dc\E$/,@domcoord)) { |
|
push(@domcoord,$dc); |
|
} |
} |
} |
} |
} |
} |
@domcoord = sort(@domcoord); |
my $numinrow = 2; |
my $numinrow = 4; |
|
my $numdc = @domcoord; |
|
my $css_class = 'class="LC_odd_row"'; |
my $css_class = 'class="LC_odd_row"'; |
my $text; |
my $text; |
if ($action eq 'requestcourses') { |
if ($action eq 'requestcourses') { |
Line 1827 sub print_requestmail {
|
Line 1983 sub print_requestmail {
|
$datatable = '<tr '.$css_class.'>'. |
$datatable = '<tr '.$css_class.'>'. |
' <td>'.$text.'</td>'. |
' <td>'.$text.'</td>'. |
' <td class="LC_left_item">'; |
' <td class="LC_left_item">'; |
if (@domcoord > 0) { |
my ($numdc,$table,$rows) = &active_dc_picker($dom,$numinrow,'checkbox', |
$datatable .= '<table>'; |
'reqapprovalnotify',%currapp); |
for (my $i=0; $i<$numdc; $i++) { |
if ($numdc > 0) { |
my $rem = $i%($numinrow); |
$datatable .= $table; |
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
$rows ++; |
|
} |
|
my $check = ' '; |
|
if (grep(/^\Q$domcoord[$i]\E$/,@currapproval)) { |
|
$check = ' checked="checked" '; |
|
} |
|
my ($uname,$udom) = split(':',$domcoord[$i]); |
|
my $fullname = &Apache::loncommon::plainname($uname,$udom); |
|
if ($i == $numdc-1) { |
|
my $colsleft = $numinrow-$rem; |
|
if ($colsleft > 1) { |
|
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
|
} else { |
|
$datatable .= '<td class="LC_left_item">'; |
|
} |
|
} else { |
|
$datatable .= '<td class="LC_left_item">'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="reqapprovalnotify" '. |
|
'value="'.$domcoord[$i].'"'.$check.'/>'. |
|
$fullname.'</label></span></td>'; |
|
} |
|
$datatable .= '</tr></table>'; |
|
} else { |
} else { |
$datatable .= &mt('There are no active Domain Coordinators'); |
$datatable .= &mt('There are no active Domain Coordinators'); |
$rows ++; |
|
} |
} |
$datatable .='</td></tr>'; |
$datatable .='</td></tr>'; |
$$rowtotal += $rows; |
$$rowtotal += $rows; |
Line 2017 sub print_autoupdate {
|
Line 2143 sub print_autoupdate {
|
|
|
sub print_autocreate { |
sub print_autocreate { |
my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$settings,$rowtotal) = @_; |
my (%createon,%createoff); |
my (%createon,%createoff,%currhash); |
my $curr_dc; |
|
my @types = ('xml','req'); |
my @types = ('xml','req'); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
foreach my $item (@types) { |
foreach my $item (@types) { |
Line 2031 sub print_autocreate {
|
Line 2156 sub print_autocreate {
|
} |
} |
} |
} |
} |
} |
$curr_dc = $settings->{'xmldc'}; |
if ($settings->{'xmldc'} ne '') { |
|
$currhash{$settings->{'xmldc'}} = 1; |
|
} |
} else { |
} else { |
foreach my $item (@types) { |
foreach my $item (@types) { |
$createoff{$item} = ' checked="checked" '; |
$createoff{$item} = ' checked="checked" '; |
Line 2039 sub print_autocreate {
|
Line 2166 sub print_autocreate {
|
} |
} |
} |
} |
$$rowtotal += 2; |
$$rowtotal += 2; |
|
my $numinrow = 2; |
my $datatable='<tr class="LC_odd_row">'. |
my $datatable='<tr class="LC_odd_row">'. |
'<td>'.&mt('Create pending official courses from XML files').'</td>'. |
'<td>'.&mt('Create pending official courses from XML files').'</td>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
Line 2053 sub print_autocreate {
|
Line 2181 sub print_autocreate {
|
$createon{'req'}.' value="1" />'.&mt('Yes').'</label> '. |
$createon{'req'}.' value="1" />'.&mt('Yes').'</label> '. |
'<label><input type="radio" name="autocreate_req"'. |
'<label><input type="radio" name="autocreate_req"'. |
$createoff{'req'}.' value="0" />'.&mt('No').'</label></span>'; |
$createoff{'req'}.' value="0" />'.&mt('No').'</label></span>'; |
my ($numdc,$dctable) = &active_dc_picker($dom,$curr_dc); |
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
|
'autocreate_xmldc',%currhash); |
if ($numdc > 1) { |
if ($numdc > 1) { |
$datatable .= '</td></tr><tr class="LC_odd_row"><td>'. |
$datatable .= '</td></tr><tr class="LC_odd_row"><td>'. |
&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>'; |
'</td><td class="LC_left_item">'.$dctable.'</td></tr>'; |
$$rowtotal ++ ; |
|
} else { |
} else { |
$datatable .= $dctable.'</td></tr>'; |
$datatable .= $dctable.'</td></tr>'; |
} |
} |
|
$$rowtotal += $rows; |
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 2184 sub print_contacts {
|
Line 2313 sub print_contacts {
|
my @contacts = ('adminemail','supportemail'); |
my @contacts = ('adminemail','supportemail'); |
my (%checked,%to,%otheremails,%bccemails); |
my (%checked,%to,%otheremails,%bccemails); |
my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail', |
my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail', |
'requestsmail'); |
'requestsmail','updatesmail','idconflictsmail'); |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
$otheremails{$type} = ''; |
$otheremails{$type} = ''; |
} |
} |
Line 2220 sub print_contacts {
|
Line 2349 sub print_contacts {
|
$checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" '; |
$checked{'helpdeskmail'}{'supportemail'} = ' 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{'idconflictsmail'}{'adminemail'} = ' checked="checked" '; |
} |
} |
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) { |
foreach my $item (@contacts) { |
$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->{$item}. |
'<td><span class="LC_nobreak">'.$titles->{$item}. |
'</span></td><td class="LC_right_item">'. |
'</span></td><td class="LC_right_item">'. |
'<input type="text" name="'.$item.'" value="'. |
'<input type="text" name="'.$item.'" value="'. |
$to{$item}.'" /></td></tr>'; |
$to{$item}.'" /></td></tr>'; |
|
$rownum ++; |
} |
} |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
$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">'. |
'<td><span class="LC_nobreak">'. |
Line 2257 sub print_contacts {
|
Line 2387 sub print_contacts {
|
'value="'.$bccemails{$type}.'" />'; |
'value="'.$bccemails{$type}.'" />'; |
} |
} |
$datatable .= '</td></tr>'."\n"; |
$datatable .= '</td></tr>'."\n"; |
|
$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 print_helpsettings { |
sub print_helpsettings { |
my ($position,$dom,$confname,$settings,$rowtotal) = @_; |
my ($dom,$confname,$settings,$rowtotal) = @_; |
my ($css_class,$datatable,$itemcount); |
my ($datatable,$itemcount); |
my $switchserver = &check_switchserver($dom,$confname); |
|
$itemcount = 1; |
$itemcount = 1; |
if ($position eq 'top') { |
my (%choices,%defaultchecked,@toggles); |
my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles,$align); |
$choices{'submitbugs'} = &mt('Display link to: [_1]?', |
$choices{'submitbugs'} = &mt('Display link to: [_1]?', |
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
&mt('LON-CAPA bug tracker'),600,500)); |
&mt('LON-CAPA bug tracker'),600,500)); |
%defaultchecked = ('submitbugs' => 'on'); |
%defaultchecked = ('submitbugs' => 'on'); |
@toggles = ('submitbugs',); |
@toggles = ('submitbugs',); |
|
$align = 'LC_left_item'; |
|
|
|
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
\%choices,$itemcount); |
\%choices,$itemcount); |
} else { |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '<tr'.$css_class.'>'; |
|
my $url = '/adm/loginproblems.html'; |
|
my $type = 'default'; |
|
my %lt = &Apache::lonlocal::texthash ( |
|
del => 'Delete?', |
|
rep => 'Replace:', |
|
upl => 'Upload:', |
|
default => 'Default', |
|
custom => 'Custom', |
|
); |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{'loginhelpurl'}) eq 'HASH') { |
|
|
|
} elsif ($settings->{'loginhelpurl'} ne '') { |
|
$type = 'custom'; |
|
$url = $settings->{'loginhelpurl'}.'?inhibitmenu=yes'; |
|
} |
|
} |
|
$datatable .= '<td class="LC_left_item"><span class="LC_nobreak">'. |
|
&mt('Log-in help page currently in use: [_1]', |
|
&Apache::loncommon::modal_link($url,$lt{$type},600,500)). |
|
'</span></td>'."\n". |
|
'<td class="LC_left_item">'; |
|
if ($type eq 'custom') { |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="loginhelpurl_del" value="1" />'.$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="loginhelpurl" />'; |
|
} |
|
$datatable .= '</td></tr>'; |
|
} |
|
return $datatable; |
return $datatable; |
} |
} |
|
|
sub radiobutton_prefs { |
sub radiobutton_prefs { |
my ($settings,$toggles,$defaultchecked,$choices,$itemcount) = @_; |
my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick, |
|
$additional) = @_; |
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')); |
|
|
my (%checkedon,%checkedoff,$datatable,$css_class,$cell_colspan); |
my (%checkedon,%checkedoff,$datatable,$css_class); |
|
|
foreach my $item (@{$toggles}) { |
foreach my $item (@{$toggles}) { |
if ($defaultchecked->{$item} eq 'on') { |
if ($defaultchecked->{$item} eq 'on') { |
Line 2348 sub radiobutton_prefs {
|
Line 2450 sub radiobutton_prefs {
|
} |
} |
} |
} |
} |
} |
|
if ($onclick) { |
|
$onclick = ' onclick="'.$onclick.'"'; |
|
} |
foreach my $item (@{$toggles}) { |
foreach my $item (@{$toggles}) { |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$datatable .= |
$datatable .= |
'<tr'.$css_class.'><td><span class="LC_nobreak">'.$choices->{$item}. |
'<tr'.$css_class.'><td valign="top">'. |
|
'<span class="LC_nobreak">'.$choices->{$item}. |
'</span></td>'. |
'</span></td>'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
'<label><input type="radio" name="'. |
'<label><input type="radio" name="'. |
$item.'" '.$checkedon{$item}.' value="1" />'.&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" />'.&mt('No').'</label>'. |
$checkedoff{$item}.' value="0"'.$onclick.' />'.&mt('No').'</label>'. |
'</span></td>'. |
'</span>'.$additional. |
|
'</td>'. |
'</tr>'; |
'</tr>'; |
$itemcount ++; |
$itemcount ++; |
} |
} |
Line 2367 sub radiobutton_prefs {
|
Line 2474 sub radiobutton_prefs {
|
|
|
sub print_coursedefaults { |
sub print_coursedefaults { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($css_class,$datatable); |
my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles); |
my $itemcount = 1; |
my $itemcount = 1; |
|
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)', |
|
anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys', |
|
coursecredits => 'Credits can be specified for courses', |
|
); |
|
my %staticdefaults = ( |
|
anonsurvey_threshold => 10, |
|
uploadquota => 500, |
|
); |
if ($position eq 'top') { |
if ($position eq 'top') { |
my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles); |
|
%choices = |
|
&Apache::lonlocal::texthash ( |
|
canuse_pdfforms => 'Course/Community users can create/upload PDF forms', |
|
); |
|
%defaultchecked = ('canuse_pdfforms' => 'off'); |
%defaultchecked = ('canuse_pdfforms' => 'off'); |
@toggles = ('canuse_pdfforms',); |
@toggles = ('canuse_pdfforms'); |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
\%choices,$itemcount); |
\%choices,$itemcount); |
$$rowtotal += $itemcount; |
|
} else { |
} else { |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
my %choices = |
my ($currdefresponder,$def_official_credits,$def_unofficial_credits,%curruploadquota); |
&Apache::lonlocal::texthash ( |
my $currusecredits = 0; |
anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys', |
my @types = ('official','unofficial','community'); |
); |
|
my $currdefresponder; |
|
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
$currdefresponder = $settings->{'anonsurvey_threshold'}; |
$currdefresponder = $settings->{'anonsurvey_threshold'}; |
|
if (ref($settings->{'uploadquota'}) eq 'HASH') { |
|
foreach my $type (keys(%{$settings->{'uploadquota'}})) { |
|
$curruploadquota{$type} = $settings->{'uploadquota'}{$type}; |
|
} |
|
} |
|
if (ref($settings->{'coursecredits'}) eq 'HASH') { |
|
$def_official_credits = $settings->{'coursecredits'}->{'official'}; |
|
$def_unofficial_credits = $settings->{'coursecredits'}->{'unofficial'}; |
|
if (($def_official_credits ne '') || ($def_unofficial_credits ne '')) { |
|
$currusecredits = 1; |
|
} |
|
} |
} |
} |
if (!$currdefresponder) { |
if (!$currdefresponder) { |
$currdefresponder = 10; |
$currdefresponder = $staticdefaults{'anonsurvey_threshold'}; |
} elsif ($currdefresponder < 1) { |
} elsif ($currdefresponder < 1) { |
$currdefresponder = 1; |
$currdefresponder = 1; |
} |
} |
|
foreach my $type (@types) { |
|
if ($curruploadquota{$type} eq '') { |
|
$curruploadquota{$type} = $staticdefaults{'uploadquota'}; |
|
} |
|
} |
$datatable .= |
$datatable .= |
'<tr'.$css_class.'><td><span class="LC_nobreak">'.$choices{'anonsurvey_threshold'}. |
'<tr'.$css_class.'><td><span class="LC_nobreak">'. |
|
$choices{'anonsurvey_threshold'}. |
'</span></td>'. |
'</span></td>'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
'<input type="text" name="anonsurvey_threshold"'. |
'<input type="text" name="anonsurvey_threshold"'. |
' value="'.$currdefresponder.'" size="5" /></span>'. |
' value="'.$currdefresponder.'" size="5" /></span>'. |
'</td></tr>'; |
'</td></tr>'."\n". |
|
'<tr><td><span class="LC_nobreak">'. |
|
$choices{'uploadquota'}. |
|
'</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="uploadquota_'.$type.'"'. |
|
' value="'.$curruploadquota{$type}.'" size="5" /></td>'; |
|
} |
|
$datatable .= '</tr></table></td></tr>'."\n"; |
|
$itemcount += 2; |
|
my $onclick = 'toggleCredits(this.form);'; |
|
my $display = 'none'; |
|
if ($currusecredits) { |
|
$display = 'block'; |
|
} |
|
my $additional = '<div id="credits" style="display: '.$display.'">'. |
|
'<span class="LC_nobreak">'. |
|
&mt('Default credits for official courses [_1]', |
|
'<input type="text" name="official_credits" value="'. |
|
$def_official_credits.'" size="3" />'). |
|
'</span><br />'. |
|
'<span class="LC_nobreak">'. |
|
&mt('Default credits for unofficial courses [_1]', |
|
'<input type="text" name="unofficial_credits" value="'. |
|
$def_unofficial_credits.'" size="3" />'). |
|
'</span></div>'."\n"; |
|
%defaultchecked = ('coursecredits' => 'off'); |
|
@toggles = ('coursecredits'); |
|
my $current = { |
|
'coursecredits' => $currusecredits, |
|
}; |
|
(my $table,$itemcount) = |
|
&radiobutton_prefs($current,\@toggles,\%defaultchecked, |
|
\%choices,$itemcount,$onclick,$additional); |
|
$datatable .= $table; |
} |
} |
|
$$rowtotal += $itemcount; |
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 2693 sub spares_row {
|
Line 2858 sub spares_row {
|
$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"><b>'.$server.'</b> when busy, offloads to:</span></td>'."\n"; |
<span class="LC_nobreak">'. |
|
&mt('[_1] when busy, offloads to:' |
|
,'<b>'.$server.'</b>'). |
|
"\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 2817 sub print_loadbalancing {
|
Line 2985 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); |
my (%currbalancer,%currtargets,%currrules,%existing); |
if (keys(%servers) > 1) { |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
%existing = %{$settings}; |
$currbalancer = $settings->{'lonhost'}; |
} |
$currtargets = $settings->{'targets'}; |
if ((keys(%servers) > 1) || (keys(%existing) > 0)) { |
$currrules = $settings->{'rules'}; |
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer, |
} else { |
\%currtargets,\%currrules); |
($currbalancer,$currtargets) = |
|
&Apache::lonnet::get_lonbalancer_config(\%servers); |
|
} |
|
} else { |
} else { |
return; |
return; |
} |
} |
my ($othertitle,$usertypes,$types) = |
my ($othertitle,$usertypes,$types) = |
&Apache::loncommon::sorted_inst_types($dom); |
&Apache::loncommon::sorted_inst_types($dom); |
my $rownum = 6; |
my $rownum = 8; |
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
$rownum += scalar(@{$types}); |
$rownum += scalar(@{$types}); |
} |
} |
my $css_class = ' class="LC_odd_row"'; |
my @css_class = ('LC_odd_row','LC_even_row'); |
my $targets_div_style = 'display: none'; |
my $balnum = 0; |
my $disabled_div_style = 'display: block'; |
my $islast; |
my $homedom_div_style = 'display: none'; |
my (@toshow,$disabledtext); |
$datatable = '<tr'.$css_class.'>'. |
if (keys(%currbalancer) > 0) { |
'<td rowspan="'.$rownum.'" valign="top">'. |
@toshow = sort(keys(%currbalancer)); |
'<p><select name="loadbalancing_lonhost" onchange="toggleTargets();">'."\n". |
if (scalar(@toshow) < scalar(keys(%servers)) + 1) { |
'<option value=""'; |
push(@toshow,''); |
if (($currbalancer eq '') || (!grep(/^\Q$currbalancer\E$/,keys(%servers)))) { |
} |
$datatable .= ' selected="selected"'; |
} else { |
} else { |
@toshow = (''); |
$targets_div_style = 'display: block'; |
$disabledtext = &mt('No existing load balancer'); |
$disabled_div_style = 'display: none'; |
} |
if ($dom eq &Apache::lonnet::host_domain($currbalancer)) { |
foreach my $lonhost (@toshow) { |
$homedom_div_style = 'display: block'; |
if ($balnum == scalar(@toshow)-1) { |
} |
$islast = 1; |
} |
} else { |
$datatable .= '>'.&mt('None').'</option>'."\n"; |
$islast = 0; |
foreach my $lonhost (sort(keys(%servers))) { |
} |
my $selected; |
my $cssidx = $balnum%2; |
if ($lonhost eq $currbalancer) { |
my $targets_div_style = 'display: none'; |
$selected .= ' selected="selected"'; |
my $disabled_div_style = 'display: block'; |
} |
my $homedom_div_style = 'display: none'; |
$datatable .= '<option value="'.$lonhost.'"'.$selected.'>'.$lonhost.'</option>'."\n"; |
$datatable .= '<tr class="'.$css_class[$cssidx].'">'. |
} |
'<td rowspan="'.$rownum.'" valign="top">'. |
$datatable .= '</select></p></td><td rowspan="'.$rownum.'" valign="top">'. |
'<p>'; |
'<div id="loadbalancing_disabled" style="'.$disabled_div_style.'">'.&mt('No dedicated Load Balancer').'</div>'."\n". |
if ($lonhost eq '') { |
'<div id="loadbalancing_targets" style="'.$targets_div_style.'">'.&mt('Offloads to:').'<br />'; |
$datatable .= '<span class="LC_nobreak">'; |
my ($numspares,@spares) = &count_servers($currbalancer,%servers); |
if (keys(%currbalancer) > 0) { |
my @sparestypes = ('primary','default'); |
$datatable .= &mt('Add balancer:'); |
my %typetitles = &sparestype_titles(); |
} else { |
foreach my $sparetype (@sparestypes) { |
$datatable .= &mt('Enable balancer:'); |
my $targettable; |
} |
for (my $i=0; $i<$numspares; $i++) { |
$datatable .= ' '. |
my $checked; |
'<select name="loadbalancing_lonhost_'.$balnum.'"'. |
if (ref($currtargets) eq 'HASH') { |
' id="loadbalancing_lonhost_'.$balnum.'"'. |
if (ref($currtargets->{$sparetype}) eq 'ARRAY') { |
' onchange="toggleTargets('."'$balnum'".');">'."\n". |
if (grep(/^\Q$spares[$i]\E$/,@{$currtargets->{$sparetype}})) { |
'<option value="" selected="selected">'.&mt('None'). |
$checked = ' checked="checked"'; |
'</option>'."\n"; |
|
foreach my $server (sort(keys(%servers))) { |
|
next if ($currbalancer{$server}); |
|
$datatable .= '<option value="'.$server.'">'.$server.'</option>'."\n"; |
|
} |
|
$datatable .= |
|
'</select>'."\n". |
|
'<input type="hidden" name="loadbalancing_prevlonhost_'.$balnum.'" id="loadbalancing_prevlonhost_'.$balnum.'" value="" /> </span>'."\n"; |
|
} else { |
|
$datatable .= '<i>'.$lonhost.'</i><br /><span class="LC_nobreak">'. |
|
'<label><input type="checkbox" name="loadbalancing_delete" value="'.$balnum.'" id="loadbalancing_delete_'.$balnum.'" onclick="javascript:balancerDeleteChange('."'$balnum'".');" /> '. |
|
&mt('Stop balancing').'</label>'. |
|
'<input type="hidden" name="loadbalancing_lonhost_'.$balnum.'" value="'.$lonhost.'" id="loadbalancing_lonhost_'.$balnum.'" /></span>'; |
|
$targets_div_style = 'display: block'; |
|
$disabled_div_style = 'display: none'; |
|
if ($dom eq &Apache::lonnet::host_domain($lonhost)) { |
|
$homedom_div_style = 'display: block'; |
|
} |
|
} |
|
$datatable .= '</p></td><td rowspan="'.$rownum.'" valign="top">'. |
|
'<div id="loadbalancing_disabled_'.$balnum.'" style="'. |
|
$disabled_div_style.'">'.$disabledtext.'</div>'."\n". |
|
'<div id="loadbalancing_targets_'.$balnum.'" style="'.$targets_div_style.'">'.&mt('Offloads to:').'<br />'; |
|
my ($numspares,@spares) = &count_servers($lonhost,%servers); |
|
my @sparestypes = ('primary','default'); |
|
my %typetitles = &sparestype_titles(); |
|
foreach my $sparetype (@sparestypes) { |
|
my $targettable; |
|
for (my $i=0; $i<$numspares; $i++) { |
|
my $checked; |
|
if (ref($currtargets{$lonhost}) eq 'HASH') { |
|
if (ref($currtargets{$lonhost}{$sparetype}) eq 'ARRAY') { |
|
if (grep(/^\Q$spares[$i]\E$/,@{$currtargets{$lonhost}{$sparetype}})) { |
|
$checked = ' checked="checked"'; |
|
} |
|
} |
|
} |
|
my ($chkboxval,$disabled); |
|
if (($lonhost ne '') && (exists($servers{$lonhost}))) { |
|
$chkboxval = $spares[$i]; |
|
} |
|
if (exists($currbalancer{$spares[$i]})) { |
|
$disabled = ' disabled="disabled"'; |
|
} |
|
$targettable .= |
|
'<td><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. |
|
'</span></label></td>'; |
|
my $rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if (($i > 0) && ($i < $numspares-1)) { |
|
$targettable .= '</tr>'; |
|
} |
|
if ($i < $numspares-1) { |
|
$targettable .= '<tr>'; |
} |
} |
} |
} |
} |
} |
my $chkboxval; |
if ($targettable ne '') { |
if (($currbalancer ne '') && (grep((/^\Q$currbalancer\E$/,keys(%servers))))) { |
my $rem = $numspares%($numinrow); |
$chkboxval = $spares[$i]; |
my $colsleft = $numinrow - $rem; |
} |
if ($colsleft > 1 ) { |
$targettable .= '<td><label><input type="checkbox" name="loadbalancing_target_'.$sparetype.'"'. |
$targettable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
$checked.' value="'.$chkboxval.'" id="loadbalancing_target_'.$sparetype.'_'.$i.'" onclick="checkOffloads('."this,'$sparetype'".');" /><span id="loadbalancing_targettxt_'.$sparetype.'_'.$i.'"> '.$chkboxval. |
' </td>'; |
'</span></label></td>'; |
} elsif ($colsleft == 1) { |
my $rem = $i%($numinrow); |
$targettable .= '<td class="LC_left_item"> </td>'; |
if ($rem == 0) { |
} |
if ($i > 0) { |
$datatable .= '<i>'.$typetitles{$sparetype}.'</i><br />'. |
$targettable .= '</tr>'; |
'<table><tr>'.$targettable.'</tr></table><br />'; |
} |
} |
$targettable .= '<tr>'; |
} |
|
$datatable .= '</div></td></tr>'. |
|
&loadbalancing_rules($dom,$intdom,$currrules{$lonhost}, |
|
$othertitle,$usertypes,$types,\%servers, |
|
\%currbalancer,$lonhost, |
|
$targets_div_style,$homedom_div_style, |
|
$css_class[$cssidx],$balnum,$islast); |
|
$$rowtotal += $rownum; |
|
$balnum ++; |
|
} |
|
$datatable .= '<input type="hidden" name="loadbalancing_total" id="loadbalancing_total" value="'.$balnum.'" />'; |
|
return $datatable; |
|
} |
|
|
|
sub get_loadbalancers_config { |
|
my ($servers,$existing,$currbalancer,$currtargets,$currrules) = @_; |
|
return unless ((ref($servers) eq 'HASH') && |
|
(ref($existing) eq 'HASH') && (ref($currbalancer) eq 'HASH') && |
|
(ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH')); |
|
if (keys(%{$existing}) > 0) { |
|
my $oldlonhost; |
|
foreach my $key (sort(keys(%{$existing}))) { |
|
if ($key eq 'lonhost') { |
|
$oldlonhost = $existing->{'lonhost'}; |
|
$currbalancer->{$oldlonhost} = 1; |
|
} elsif ($key eq 'targets') { |
|
if ($oldlonhost) { |
|
$currtargets->{$oldlonhost} = $existing->{'targets'}; |
|
} |
|
} elsif ($key eq 'rules') { |
|
if ($oldlonhost) { |
|
$currrules->{$oldlonhost} = $existing->{'rules'}; |
|
} |
|
} elsif (ref($existing->{$key}) eq 'HASH') { |
|
$currbalancer->{$key} = 1; |
|
$currtargets->{$key} = $existing->{$key}{'targets'}; |
|
$currrules->{$key} = $existing->{$key}{'rules'}; |
} |
} |
} |
} |
if ($targettable ne '') { |
} else { |
my $rem = $numspares%($numinrow); |
my ($balancerref,$targetsref) = |
my $colsleft = $numinrow - $rem; |
&Apache::lonnet::get_lonbalancer_config($servers); |
if ($colsleft > 1 ) { |
if ((ref($balancerref) eq 'HASH') && (ref($targetsref) eq 'HASH')) { |
$targettable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
foreach my $server (sort(keys(%{$balancerref}))) { |
' </td>'; |
$currbalancer->{$server} = 1; |
} elsif ($colsleft == 1) { |
$currtargets->{$server} = $targetsref->{$server}; |
$targettable .= '<td class="LC_left_item"> </td>'; |
|
} |
} |
$datatable .= '<i>'.$typetitles{$sparetype}.'</i><br />'. |
|
'<table><tr>'.$targettable.'</table><br />'; |
|
} |
} |
} |
} |
$datatable .= '</div></td></tr>'. |
return; |
&loadbalancing_rules($dom,$intdom,$currrules,$othertitle, |
|
$usertypes,$types,\%servers,$currbalancer, |
|
$targets_div_style,$homedom_div_style,$css_class); |
|
$$rowtotal += $rownum; |
|
return $datatable; |
|
} |
} |
|
|
sub loadbalancing_rules { |
sub loadbalancing_rules { |
my ($dom,$intdom,$currrules,$othertitle,$usertypes,$types,$servers, |
my ($dom,$intdom,$currrules,$othertitle,$usertypes,$types,$servers, |
$currbalancer,$targets_div_style,$homedom_div_style,$css_class) = @_; |
$currbalancer,$lonhost,$targets_div_style,$homedom_div_style, |
|
$css_class,$balnum,$islast) = @_; |
my $output; |
my $output; |
my ($alltypes,$othertypes,$titles) = |
my $num = 0; |
|
my ($alltypes,$othertypes,$titles) = |
&loadbalancing_titles($dom,$intdom,$usertypes,$types); |
&loadbalancing_titles($dom,$intdom,$usertypes,$types); |
if ((ref($alltypes) eq 'ARRAY') && (ref($titles) eq 'HASH')) { |
if ((ref($alltypes) eq 'ARRAY') && (ref($titles) eq 'HASH')) { |
foreach my $type (@{$alltypes}) { |
foreach my $type (@{$alltypes}) { |
|
$num ++; |
my $current; |
my $current; |
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')) { |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) { |
if ($dom ne &Apache::lonnet::host_domain($currbalancer)) { |
if ($dom ne &Apache::lonnet::host_domain($lonhost)) { |
$current = ''; |
$current = ''; |
} |
} |
} |
} |
$output .= &loadbalance_rule_row($type,$titles->{$type},$current, |
$output .= &loadbalance_rule_row($type,$titles->{$type},$current, |
$servers,$currbalancer,$dom, |
$servers,$currbalancer,$lonhost,$dom, |
$targets_div_style,$homedom_div_style,$css_class); |
$targets_div_style,$homedom_div_style, |
|
$css_class,$balnum,$num,$islast); |
} |
} |
} |
} |
return $output; |
return $output; |
Line 2946 sub loadbalancing_titles {
|
Line 3197 sub loadbalancing_titles {
|
'_LC_author' => &mt('Users from [_1] with author role',$dom), |
'_LC_author' => &mt('Users from [_1] with author role',$dom), |
'_LC_internetdom' => &mt('Users not from [_1], but from [_2]',$dom,$intdom), |
'_LC_internetdom' => &mt('Users not from [_1], but from [_2]',$dom,$intdom), |
'_LC_external' => &mt('Users not from [_1]',$intdom), |
'_LC_external' => &mt('Users not from [_1]',$intdom), |
|
'_LC_ipchangesso' => &mt('SSO users from [_1], with IP mismatch',$dom), |
|
'_LC_ipchange' => &mt('Non-SSO users with IP mismatch'), |
); |
); |
my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external'); |
my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external','_LC_ipchangesso','_LC_ipchange'); |
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
unshift(@alltypes,@{$types},'default'); |
unshift(@alltypes,@{$types},'default'); |
} |
} |
Line 2970 sub loadbalancing_titles {
|
Line 3223 sub loadbalancing_titles {
|
} |
} |
|
|
sub loadbalance_rule_row { |
sub loadbalance_rule_row { |
my ($type,$title,$current,$servers,$currbalancer,$dom,$targets_div_style, |
my ($type,$title,$current,$servers,$currbalancer,$lonhost,$dom, |
$homedom_div_style,$css_class) = @_; |
$targets_div_style,$homedom_div_style,$css_class,$balnum,$num,$islast) = @_; |
my @rulenames = ('default','homeserver'); |
my @rulenames; |
my %ruletitles = &offloadtype_text(); |
my %ruletitles = &offloadtype_text(); |
if ($type eq '_LC_external') { |
if (($type eq '_LC_ipchangesso') || ($type eq '_LC_ipchange')) { |
push(@rulenames,'externalbalancer'); |
@rulenames = ('balancer','offloadedto'); |
} else { |
} else { |
push(@rulenames,'specific'); |
@rulenames = ('default','homeserver'); |
|
if ($type eq '_LC_external') { |
|
push(@rulenames,'externalbalancer'); |
|
} else { |
|
push(@rulenames,'specific'); |
|
} |
|
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')) { |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) { |
$style = $homedom_div_style; |
$style = $homedom_div_style; |
} |
} |
my $output = |
my $space; |
'<tr'.$css_class.'><td valign="top"><div id="balanceruletitle_'.$type.'" style="'.$style.'">'.$title.'</div></td>'."\n". |
if ($islast && $num == 1) { |
'<td><div id="balancerule_'.$type.'" style="'.$style.'">'."\n"; |
$space = '<div display="inline-block"> </div>'; |
|
} |
|
my $output = |
|
'<tr class="'.$css_class.'" id="balanceruletr_'.$balnum.'_'.$num.'"><td valign="top">'.$space. |
|
'<div id="balanceruletitle_'.$balnum.'_'.$type.'" style="'.$style.'">'.$title.'</div></td>'."\n". |
|
'<td valaign="top">'.$space. |
|
'<div id="balancerule_'.$balnum.'_'.$type.'" style="'.$style.'">'."\n"; |
for (my $i=0; $i<@rulenames; $i++) { |
for (my $i=0; $i<@rulenames; $i++) { |
my $rule = $rulenames[$i]; |
my $rule = $rulenames[$i]; |
my ($checked,$extra); |
my ($checked,$extra); |
Line 3002 sub loadbalance_rule_row {
|
Line 3266 sub loadbalance_rule_row {
|
unless ($checked) { |
unless ($checked) { |
$default = ' selected="selected"'; |
$default = ' selected="selected"'; |
} |
} |
$extra = ': <select name="loadbalancing_singleserver_'.$type. |
$extra = |
'" id="loadbalancing_singleserver_'.$type. |
': <select name="loadbalancing_singleserver_'.$balnum.'_'.$type. |
'" onchange="singleServerToggle('."'$type'".')">'."\n". |
'" id="loadbalancing_singleserver_'.$balnum.'_'.$type. |
'<option value=""'.$default.'></option>'."\n"; |
'" onchange="singleServerToggle('."'$balnum','$type'".')">'."\n". |
foreach my $lonhost (sort(keys(%{$servers}))) { |
'<option value=""'.$default.'></option>'."\n"; |
next if ($lonhost eq $currbalancer); |
foreach my $server (sort(keys(%{$servers}))) { |
|
if (ref($currbalancer) eq 'HASH') { |
|
next if (exists($currbalancer->{$server})); |
|
} |
my $selected; |
my $selected; |
if ($lonhost eq $current) { |
if ($server eq $current) { |
$selected = ' selected="selected"'; |
$selected = ' selected="selected"'; |
} |
} |
$extra .= '<option value="'.$lonhost.'"'.$selected.'>'.$lonhost.'</option>'; |
$extra .= '<option value="'.$server.'"'.$selected.'>'.$server.'</option>'; |
} |
} |
$extra .= '</select>'; |
$extra .= '</select>'; |
} |
} |
Line 3020 sub loadbalance_rule_row {
|
Line 3287 sub loadbalance_rule_row {
|
$checked = ' checked="checked"'; |
$checked = ' checked="checked"'; |
} |
} |
$output .= '<span class="LC_nobreak"><label>'. |
$output .= '<span class="LC_nobreak"><label>'. |
'<input type="radio" name="loadbalancing_rules_'.$type. |
'<input type="radio" name="loadbalancing_rules_'.$balnum.'_'.$type. |
'" id="loadbalancing_rules_'.$type.'_'.$i.'" value="'. |
'" id="loadbalancing_rules_'.$balnum.'_'.$type.'_'.$i.'" value="'. |
$rule.'" onclick="balanceruleChange('."this.form,'$type'". |
$rule.'" onclick="balanceruleChange('."this.form,'$balnum','$type'". |
')"'.$checked.' /> '.$ruletitles{$rulenames[$i]}. |
')"'.$checked.' /> '.$ruletitles{$rulenames[$i]}. |
'</label>'.$extra.'</span><br />'."\n"; |
'</label>'.$extra.'</span><br />'."\n"; |
} |
} |
Line 3037 sub offloadtype_text {
|
Line 3304 sub offloadtype_text {
|
'externalbalancer' => "Offloads to Load Balancer in user's domain", |
'externalbalancer' => "Offloads to Load Balancer in user's domain", |
'specific' => 'Offloads to specific server', |
'specific' => 'Offloads to specific server', |
'none' => 'No offload', |
'none' => 'No offload', |
|
'balancer' => 'Session hosted on Load Balancer, after re-authentication', |
|
'offloadedto' => 'Session hosted on offload server, after re-authentication', |
); |
); |
return %ruletitles; |
return %ruletitles; |
} |
} |
Line 3058 sub contact_titles {
|
Line 3327 sub contact_titles {
|
'helpdeskmail' => 'Helpdesk requests to be e-mailed to', |
'helpdeskmail' => 'Helpdesk requests to be e-mailed to', |
'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)', |
'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)', |
'requestsmail' => 'E-mail from course requests requiring approval', |
'requestsmail' => 'E-mail from course requests requiring approval', |
|
'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates', |
|
'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID', |
); |
); |
my %short_titles = &Apache::lonlocal::texthash ( |
my %short_titles = &Apache::lonlocal::texthash ( |
adminemail => 'Admin E-mail address', |
adminemail => 'Admin E-mail address', |
Line 3100 sub authorrequest_titles {
|
Line 3371 sub authorrequest_titles {
|
automatic => 'Automatic approval', |
automatic => 'Automatic approval', |
); |
); |
return %titles; |
return %titles; |
} |
} |
|
|
sub courserequest_conditions { |
sub courserequest_conditions { |
my %conditions = &Apache::lonlocal::texthash ( |
my %conditions = &Apache::lonlocal::texthash ( |
approval => '(Processing of request subject to approval by Domain Coordinator).', |
approval => '(Processing of request subject to approval by Domain Coordinator).', |
validate => '(Processing of request subject to instittutional validation).', |
validate => '(Processing of request subject to institutional validation).', |
); |
); |
return %conditions; |
return %conditions; |
} |
} |
Line 3241 sub print_usercreation {
|
Line 3512 sub print_usercreation {
|
$dom,$numinrow,$othertitle, |
$dom,$numinrow,$othertitle, |
'statustocreate'); |
'statustocreate'); |
$$rowtotal ++; |
$$rowtotal ++; |
|
$rownum ++; |
} |
} |
} |
} |
$datatable .= &captcha_choice('cancreate',$createsettings); |
$datatable .= &captcha_choice('cancreate',$createsettings,$rownum); |
} else { |
} else { |
my @contexts = ('author','course','domain'); |
my @contexts = ('author','course','domain'); |
my @authtypes = ('int','krb4','krb5','loc'); |
my @authtypes = ('int','krb4','krb5','loc'); |
Line 3296 sub print_usercreation {
|
Line 3568 sub print_usercreation {
|
} |
} |
|
|
sub captcha_choice { |
sub captcha_choice { |
my ($context,$settings) = @_; |
my ($context,$settings,$itemcount) = @_; |
my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext); |
my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext); |
my %lt = &captcha_phrases(); |
my %lt = &captcha_phrases(); |
$keyentry = 'hidden'; |
$keyentry = 'hidden'; |
if ($context eq 'cancreate') { |
if ($context eq 'cancreate') { |
$rowname = &mt('CAPTCHA validation (e-mail as username)'); |
$rowname = &mt('CAPTCHA validation (e-mail as username)'); |
} elsif ($context eq 'help') { |
} elsif ($context eq 'login') { |
$rowname = &mt('CAPTCHA validation'); |
$rowname = &mt('"Contact helpdesk" CAPTCHA validation'); |
} |
} |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ($settings->{'captcha'}) { |
if ($settings->{'captcha'}) { |
Line 3323 sub captcha_choice {
|
Line 3595 sub captcha_choice {
|
} else { |
} else { |
$checked{'original'} = ' checked="checked"'; |
$checked{'original'} = ' checked="checked"'; |
} |
} |
my $output = '<tr class="LC_odd_row">'. |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
'<td class="LC_left_item">'.$rowname.'</td><td class="LC_right_item" colspan="2">'."\n". |
my $output = '<tr'.$css_class.'>'. |
|
'<td class="LC_left_item">'.$rowname.'</td><td class="LC_left_item" colspan="2">'."\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 3337 sub captcha_choice {
|
Line 3610 sub captcha_choice {
|
# |
# |
# Note: If reCAPTCHA is to be used for LON-CAPA servers in a domain, a domain coordinator should visit: |
# Note: If reCAPTCHA is to be used for LON-CAPA servers in a domain, a domain coordinator should visit: |
# https://www.google.com/recaptcha and generate a Public and Private key. For domains with multiple |
# https://www.google.com/recaptcha and generate a Public and Private key. For domains with multiple |
# servers a single key pair will be used for all servers, so the internet domain (e.g., yourcollege.edu) |
# servers a single key pair will be used for all servers, so the internet domain (e.g., yourcollege.edu) |
# 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>'."\n". |
'<span class="LC_nobreak"><span id="'.$context.'_recaptchapubtxt">'.$pubtext.'</span> '."\n". |
'<span class="LC_nobreak"><span id="'.$context.'_recaptchapubtxt">'.$pubtext.'</span> '."\n". |
Line 3526 sub print_defaults {
|
Line 3799 sub print_defaults {
|
} elsif ($item eq 'datelocale_def') { |
} elsif ($item eq 'datelocale_def') { |
my $includeempty = 1; |
my $includeempty = 1; |
$datatable .= &Apache::loncommon::select_datelocale($item,$domdefaults{$item},undef,$includeempty); |
$datatable .= &Apache::loncommon::select_datelocale($item,$domdefaults{$item},undef,$includeempty); |
|
} elsif ($item eq 'lang_def') { |
|
my %langchoices = &get_languages_hash(); |
|
$langchoices{''} = 'No language preference'; |
|
%langchoices = &Apache::lonlocal::texthash(%langchoices); |
|
$datatable .= &Apache::loncommon::select_form($domdefaults{$item},$item, |
|
\%langchoices); |
} else { |
} else { |
my $size; |
my $size; |
if ($item eq 'portal_def') { |
if ($item eq 'portal_def') { |
Line 3541 sub print_defaults {
|
Line 3820 sub print_defaults {
|
return $datatable; |
return $datatable; |
} |
} |
|
|
|
sub get_languages_hash { |
|
my %langchoices; |
|
foreach my $id (&Apache::loncommon::languageids()) { |
|
my $code = &Apache::loncommon::supportedlanguagecode($id); |
|
if ($code ne '') { |
|
$langchoices{$code} = &Apache::loncommon::plainlanguagedescription($id); |
|
} |
|
} |
|
return %langchoices; |
|
} |
|
|
sub defaults_titles { |
sub defaults_titles { |
my ($dom) = @_; |
my ($dom) = @_; |
my %titles = &Apache::lonlocal::texthash ( |
my %titles = &Apache::lonlocal::texthash ( |
Line 3673 sub print_scantronformat {
|
Line 3963 sub print_scantronformat {
|
$datatable .= '<td>'.&mt('Default in use:').'<br />'. |
$datatable .= '<td>'.&mt('Default in use:').'<br />'. |
'<span class="LC_nobreak">'; |
'<span class="LC_nobreak">'; |
if ($scantronurl) { |
if ($scantronurl) { |
$datatable .= '<a href="'.$scantronurl.'" target="_blank">'. |
$datatable .= &Apache::loncommon::modal_link($scantronurl,&mt('Default bubblesheet format file'),600,500, |
&mt('Default bubblesheet format file').'</a>'; |
undef,undef,undef,undef,'background-color:#ffffff'); |
} else { |
} else { |
$datatable = &mt('File unavailable for display'); |
$datatable = &mt('File unavailable for display'); |
} |
} |
Line 3699 sub print_scantronformat {
|
Line 3989 sub print_scantronformat {
|
} |
} |
$datatable .= '<td>'.$errorstr.'</td><td> '; |
$datatable .= '<td>'.$errorstr.'</td><td> '; |
} elsif ($scantronurl) { |
} elsif ($scantronurl) { |
|
my $link = &Apache::loncommon::modal_link($scantronurl,&mt('Custom bubblesheet format file'),600,500, |
|
undef,undef,undef,undef,'background-color:#ffffff'); |
$datatable .= '<td><span class="LC_nobreak">'. |
$datatable .= '<td><span class="LC_nobreak">'. |
'<a href="'.$scantronurl.'" target="_blank">'. |
$link. |
&mt('Custom bubblesheet format file').'</a><label>'. |
'<label><input type="checkbox" name="scantronformat_del"'. |
'<input type="checkbox" name="scantronformat_del"'. |
' value="1" />'.&mt('Delete?').'</label></span></td>'. |
'" value="1" />'.&mt('Delete?').'</label></span></td>'. |
|
'<td><span class="LC_nobreak"> '. |
'<td><span class="LC_nobreak"> '. |
&mt('Replace:').'</span><br />'; |
&mt('Replace:').'</span><br />'; |
} |
} |
Line 4001 sub print_serverstatuses {
|
Line 4292 sub print_serverstatuses {
|
|
|
sub serverstatus_pages { |
sub serverstatus_pages { |
return ('userstatus','lonstatus','loncron','server-status','codeversions', |
return ('userstatus','lonstatus','loncron','server-status','codeversions', |
'clusterstatus','metadata_keywords','metadata_harvest', |
'checksums','clusterstatus','metadata_keywords','metadata_harvest', |
'takeoffline','takeonline','showenv','toggledebug','ping','domconf'); |
'takeoffline','takeonline','showenv','toggledebug','ping','domconf'); |
} |
} |
|
|
Line 4159 sub build_category_rows {
|
Line 4450 sub build_category_rows {
|
if (ref($cats->[$depth]{$parent}) eq 'ARRAY') { |
if (ref($cats->[$depth]{$parent}) eq 'ARRAY') { |
my $numchildren = @{$cats->[$depth]{$parent}}; |
my $numchildren = @{$cats->[$depth]{$parent}}; |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
$text .= '<td><table class="LC_datatable">'; |
$text .= '<td><table class="LC_data_table">'; |
my ($idxnum,$parent_name,$parent_item); |
my ($idxnum,$parent_name,$parent_item); |
my $higher = $depth - 1; |
my $higher = $depth - 1; |
if ($higher == 0) { |
if ($higher == 0) { |
Line 4451 sub usertype_update_row {
|
Line 4742 sub usertype_update_row {
|
} |
} |
|
|
sub modify_login { |
sub modify_login { |
my ($r,$dom,$confname,%domconfig) = @_; |
my ($r,$dom,$confname,$lastactref,%domconfig) = @_; |
my ($resulttext,$errors,$colchgtext,%changes,%colchanges); |
my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl, |
my %title = ( coursecatalog => 'Display course catalog', |
%curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon); |
adminmail => 'Display administrator E-mail address', |
%title = ( coursecatalog => 'Display course catalog', |
newuser => 'Link for visitors to create a user account', |
adminmail => 'Display administrator E-mail address', |
loginheader => 'Log-in box header'); |
helpdesk => 'Display "Contact Helpdesk" link', |
my @offon = ('off','on'); |
newuser => 'Link for visitors to create a user account', |
my %curr_loginvia; |
loginheader => 'Log-in box header'); |
|
@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') { |
foreach my $lonhost (keys(%{$domconfig{login}{loginvia}})) { |
foreach my $lonhost (keys(%{$domconfig{login}{loginvia}})) { |
Line 4466 sub modify_login {
|
Line 4758 sub modify_login {
|
} |
} |
} |
} |
} |
} |
my %loginhash; |
|
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], |
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], |
\%domconfig,\%loginhash); |
\%domconfig,\%loginhash); |
my @toggles = ('coursecatalog','adminmail','newuser'); |
my @toggles = ('coursecatalog','adminmail','helpdesk','newuser'); |
foreach my $item (@toggles) { |
foreach my $item (@toggles) { |
$loginhash{login}{$item} = $env{'form.'.$item}; |
$loginhash{login}{$item} = $env{'form.'.$item}; |
} |
} |
Line 4539 sub modify_login {
|
Line 4830 sub modify_login {
|
$new = ''; |
$new = ''; |
} |
} |
} |
} |
|
|
$loginhash{login}{loginvia}{$lonhost}{$item} = $new; |
$loginhash{login}{loginvia}{$lonhost}{$item} = $new; |
} |
} |
} |
} |
Line 4565 sub modify_login {
|
Line 4855 sub modify_login {
|
} |
} |
} |
} |
|
|
|
my $servadm = $r->dir_config('lonAdmEMail'); |
|
my %langchoices = &Apache::lonlocal::texthash(&get_languages_hash()); |
|
if (ref($domconfig{'login'}) eq 'HASH') { |
|
if (ref($domconfig{'login'}{'helpurl'}) eq 'HASH') { |
|
foreach my $lang (sort(keys(%{$domconfig{'login'}{'helpurl'}}))) { |
|
if ($lang eq 'nolang') { |
|
push(@currlangs,$lang); |
|
} elsif (defined($langchoices{$lang})) { |
|
push(@currlangs,$lang); |
|
} else { |
|
next; |
|
} |
|
} |
|
} |
|
} |
|
my @delurls = &Apache::loncommon::get_env_multiple('form.loginhelpurl_del'); |
|
if (@currlangs > 0) { |
|
foreach my $lang (@currlangs) { |
|
if (grep(/^\Q$lang\E$/,@delurls)) { |
|
$changes{'helpurl'}{$lang} = 1; |
|
} elsif ($env{'form.loginhelpurl_'.$lang.'.filename'}) { |
|
$changes{'helpurl'}{$lang} = 1; |
|
$newfile{$lang} = $env{'form.loginhelpurl_'.$lang.'.filename'}; |
|
push(@newlangs,$lang); |
|
} else { |
|
$loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang}; |
|
} |
|
} |
|
} |
|
unless (grep(/^nolang$/,@currlangs)) { |
|
if ($env{'form.loginhelpurl_nolang.filename'}) { |
|
$changes{'helpurl'}{'nolang'} = 1; |
|
$newfile{'nolang'} = $env{'form.loginhelpurl_nolang.filename'}; |
|
push(@newlangs,'nolang'); |
|
} |
|
} |
|
if ($env{'form.loginhelpurl_add_lang'}) { |
|
if ((defined($langchoices{$env{'form.loginhelpurl_add_lang'}})) && |
|
($env{'form.loginhelpurl_add_file.filename'})) { |
|
$newfile{$env{'form.loginhelpurl_add_lang'}} = $env{'form.loginhelpurl_add_file.filename'}; |
|
$addedfile = $env{'form.loginhelpurl_add_lang'}; |
|
} |
|
} |
|
if ((@newlangs > 0) || ($addedfile)) { |
|
my $error; |
|
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
|
if ($configuserok eq 'ok') { |
|
if ($switchserver) { |
|
$error = &mt("Upload of custom help file is not permitted to this server: [_1]",$switchserver); |
|
} elsif ($author_ok eq 'ok') { |
|
my @allnew = @newlangs; |
|
if ($addedfile ne '') { |
|
push(@allnew,$addedfile); |
|
} |
|
foreach my $lang (@allnew) { |
|
my $formelem = 'loginhelpurl_'.$lang; |
|
if ($lang eq $env{'form.loginhelpurl_add_lang'}) { |
|
$formelem = 'loginhelpurl_add_file'; |
|
} |
|
(my $result,$newurl{$lang}) = &publishlogo($r,'upload',$formelem,$dom,$confname, |
|
"help/$lang",'','',$newfile{$lang}); |
|
if ($result eq 'ok') { |
|
$loginhash{'login'}{'helpurl'}{$lang} = $newurl{$lang}; |
|
$changes{'helpurl'}{$lang} = 1; |
|
} else { |
|
my $puberror = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$newfile{$lang},$result); |
|
$errors .= '<li><span class="LC_error">'.$puberror.'</span></li>'; |
|
if ((grep(/^\Q$lang\E$/,@currlangs)) && |
|
(!grep(/^\Q$lang\E$/,@delurls))) { |
|
|
|
$loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang}; |
|
} |
|
} |
|
} |
|
} else { |
|
$error = &mt("Upload of custom log-in help file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2]. Error was: [_3].",$confname,$dom,$author_ok); |
|
} |
|
} else { |
|
$error = &mt("Upload of custom log-in help 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'}); |
|
|
|
my $defaulthelpfile = '/adm/loginproblems.html'; |
|
my $defaulttext = &mt('Default in use'); |
|
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash, |
$dom); |
$dom); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
my @toggles = ('coursecatalog','adminmail','newuser'); |
my @toggles = ('coursecatalog','adminmail','helpdesk','newuser'); |
my %defaultchecked = ( |
my %defaultchecked = ( |
'coursecatalog' => 'on', |
'coursecatalog' => 'on', |
|
'helpdesk' => 'on', |
'adminmail' => 'off', |
'adminmail' => 'off', |
'newuser' => 'off', |
'newuser' => 'off', |
); |
); |
Line 4599 sub modify_login {
|
Line 4980 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); |
|
$$lastactref = 'update'; |
$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 'loginvia') { |
if ($item eq 'loginvia') { |
Line 4630 sub modify_login {
|
Line 5012 sub modify_login {
|
} |
} |
$resulttext .= '</ul></li>'; |
$resulttext .= '</ul></li>'; |
} |
} |
|
} elsif ($item eq 'helpurl') { |
|
if (ref($changes{$item}) eq 'HASH') { |
|
foreach my $lang (sort(keys(%{$changes{$item}}))) { |
|
if (grep(/^\Q$lang\E$/,@delurls)) { |
|
my ($chg,$link); |
|
$link = &Apache::loncommon::modal_link($defaulthelpfile,$defaulttext,600,500); |
|
if ($lang eq 'nolang') { |
|
$chg = &mt('custom log-in help file removed for no preferred language; [_1]',$link); |
|
} else { |
|
$chg = &mt('custom log-in help file removed for specific language: [_1]; [_2]',$langchoices{$lang},$link); |
|
} |
|
$resulttext .= '<li>'.$chg.'</li>'; |
|
} else { |
|
my $chg; |
|
if ($lang eq 'nolang') { |
|
$chg = &mt('custom log-in help file for no preferred language'); |
|
} else { |
|
$chg = &mt('custom log-in help file for specific language: [_1]',$langchoices{$lang}); |
|
} |
|
$resulttext .= '<li>'.&Apache::loncommon::modal_link( |
|
$loginhash{'login'}{'helpurl'}{$lang}. |
|
'?inhibitmenu=yes',$chg,600,500). |
|
'</li>'; |
|
} |
|
} |
|
} |
|
} elsif ($item eq 'captcha') { |
|
if (ref($loginhash{'login'}) eq 'HASH') { |
|
my $chgtxt; |
|
if ($loginhash{'login'}{$item} eq 'notused') { |
|
$chgtxt .= &mt('No CAPTCHA validation in use for helpdesk form.'); |
|
} else { |
|
my %captchas = &captcha_phrases(); |
|
if ($captchas{$loginhash{'login'}{$item}}) { |
|
$chgtxt .= &mt("Validation for helpdesk form set to $captchas{$loginhash{'login'}{$item}}."); |
|
} else { |
|
$chgtxt .= &mt('Validation for helpdesk form set to unknown type.'); |
|
} |
|
} |
|
$resulttext .= '<li>'.$chgtxt.'</li>'; |
|
} |
|
} elsif ($item eq 'recaptchakeys') { |
|
if (ref($loginhash{'login'}) eq 'HASH') { |
|
my ($privkey,$pubkey); |
|
if (ref($loginhash{'login'}{$item}) eq 'HASH') { |
|
$pubkey = $loginhash{'login'}{$item}{'public'}; |
|
$privkey = $loginhash{'login'}{$item}{'private'}; |
|
} |
|
my $chgtxt .= &mt('ReCAPTCHA keys changes').'<ul>'; |
|
if (!$pubkey) { |
|
$chgtxt .= '<li>'.&mt('Public key deleted').'</li>'; |
|
} else { |
|
$chgtxt .= '<li>'.&mt('Public key set to [_1]',$pubkey).'</li>'; |
|
} |
|
if (!$privkey) { |
|
$chgtxt .= '<li>'.&mt('Private key deleted').'</li>'; |
|
} else { |
|
$chgtxt .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>'; |
|
} |
|
$chgtxt .= '</ul>'; |
|
$resulttext .= '<li>'.$chgtxt.'</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 4657 sub color_font_choices {
|
Line 5101 sub color_font_choices {
|
links => "Link colors", |
links => "Link colors", |
images => "Images", |
images => "Images", |
font => "Font color", |
font => "Font color", |
fontmenu => "Font Menu", |
fontmenu => "Font menu", |
pgbg => "Page", |
pgbg => "Page", |
tabbg => "Header", |
tabbg => "Header", |
sidebg => "Border", |
sidebg => "Border", |
Line 4669 sub color_font_choices {
|
Line 5113 sub color_font_choices {
|
} |
} |
|
|
sub modify_rolecolors { |
sub modify_rolecolors { |
my ($r,$dom,$confname,$roles,%domconfig) = @_; |
my ($r,$dom,$confname,$roles,$lastactref,%domconfig) = @_; |
my ($resulttext,%rolehash); |
my ($resulttext,%rolehash); |
$rolehash{'rolecolors'} = {}; |
$rolehash{'rolecolors'} = {}; |
if (ref($domconfig{'rolecolors'}) ne 'HASH') { |
if (ref($domconfig{'rolecolors'}) ne 'HASH') { |
Line 4684 sub modify_rolecolors {
|
Line 5128 sub modify_rolecolors {
|
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
|
$$lastactref = 'update'; |
$resulttext = &display_colorchgs($dom,\%changes,$roles, |
$resulttext = &display_colorchgs($dom,\%changes,$roles, |
$rolehash{'rolecolors'}); |
$rolehash{'rolecolors'}); |
} else { |
} else { |
Line 4709 sub modify_colors {
|
Line 5154 sub modify_colors {
|
my @images; |
my @images; |
my $servadm = $r->dir_config('lonAdmEMail'); |
my $servadm = $r->dir_config('lonAdmEMail'); |
my $errors; |
my $errors; |
|
my %defaults; |
foreach my $role (@{$roles}) { |
foreach my $role (@{$roles}) { |
if ($role eq 'login') { |
if ($role eq 'login') { |
%choices = &login_choices(); |
%choices = &login_choices(); |
@logintext = ('textcol','bgcol'); |
@logintext = ('textcol','bgcol'); |
} else { |
} else { |
%choices = &color_font_choices(); |
%choices = &color_font_choices(); |
$confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'}; |
|
} |
} |
if ($role eq 'login') { |
if ($role eq 'login') { |
@images = ('img','logo','domlogo','login'); |
@images = ('img','logo','domlogo','login'); |
@bgs = ('pgbg','mainbg','sidebg'); |
@bgs = ('pgbg','mainbg','sidebg'); |
} else { |
} else { |
@images = ('img'); |
@images = ('img'); |
@bgs = ('pgbg','tabbg','sidebg'); |
@bgs = ('pgbg','tabbg','sidebg'); |
} |
} |
$confhash->{$role}{'font'} = $env{'form.'.$role.'_font'}; |
my %defaults = &role_defaults($role,\@bgs,\@links,\@images,\@logintext); |
foreach my $item (@bgs,@links,@logintext) { |
unless ($env{'form.'.$role.'_font'} eq $defaults{'font'}) { |
$confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item}; |
$confhash->{$role}{'font'} = $env{'form.'.$role.'_font'}; |
|
} |
|
if ($role eq 'login') { |
|
foreach my $item (@logintext) { |
|
unless ($env{'form.'.$role.'_'.$item} eq $defaults{'logintext'}{$item}) { |
|
$confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item}; |
|
} |
|
} |
|
} else { |
|
unless($env{'form.'.$role.'_fontmenu'} eq $defaults{'fontmenu'}) { |
|
$confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'}; |
|
} |
|
} |
|
foreach my $item (@bgs) { |
|
unless ($env{'form.'.$role.'_'.$item} eq $defaults{'bgs'}{$item} ) { |
|
$confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item}; |
|
} |
|
} |
|
foreach my $item (@links) { |
|
unless ($env{'form.'.$role.'_'.$item} eq $defaults{'links'}{$item}) { |
|
$confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item}; |
|
} |
} |
} |
my ($configuserok,$author_ok,$switchserver) = |
my ($configuserok,$author_ok,$switchserver) = |
&config_check($dom,$confname,$servadm); |
&config_check($dom,$confname,$servadm); |
Line 5074 sub publishlogo {
|
Line 5540 sub publishlogo {
|
# See if there is anything left |
# See if there is anything left |
unless ($fname) { return ('error: no uploaded file'); } |
unless ($fname) { return ('error: no uploaded file'); } |
$fname="$subdir/$fname"; |
$fname="$subdir/$fname"; |
my $docroot=$r->dir_config('lonDocRoot'); |
my $docroot=$r->dir_config('lonDocRoot'); |
my $filepath="$docroot/priv"; |
my $filepath="$docroot/priv"; |
my $relpath = "$dom/$confname"; |
my $relpath = "$dom/$confname"; |
my ($fnamepath,$file,$fetchthumb); |
my ($fnamepath,$file,$fetchthumb); |
Line 5094 sub publishlogo {
|
Line 5560 sub publishlogo {
|
if ($file=~/\.(\w+)$/ && |
if ($file=~/\.(\w+)$/ && |
(&Apache::loncommon::fileembstyle($1) eq 'hdn')) { |
(&Apache::loncommon::fileembstyle($1) eq 'hdn')) { |
$output = |
$output = |
&mt('Invalid file extension ([_1]) - reserved for LONCAPA use.',$1); |
&mt('Invalid file extension ([_1]) - reserved for internal use.',$1); |
} elsif ($file=~/\.(\w+)$/ && |
} elsif ($file=~/\.(\w+)$/ && |
!defined(&Apache::loncommon::fileembstyle($1))) { |
!defined(&Apache::loncommon::fileembstyle($1))) { |
$output = &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1); |
$output = &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1); |
} elsif ($file=~/\.(\d+)\.(\w+)$/) { |
} elsif ($file=~/\.(\d+)\.(\w+)$/) { |
$output = &mt('File name not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2); |
$output = &mt('Filename not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2); |
} elsif (-d "$filepath/$file") { |
} elsif (-d "$filepath/$file") { |
$output = &mt('File name is a directory name - rename the file and re-upload'); |
$output = &mt('Filename is a directory name - rename the file and re-upload'); |
} 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 Construction Space')); |
return (&mt('No write permission to Authoring Space')); |
} |
} |
print $logfile |
print $logfile |
"\n================= Publish ".localtime()." ================\n". |
"\n================= Publish ".localtime()." ================\n". |
Line 5253 sub write_metadata {
|
Line 5719 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=$_; |
$unikey=~/^([A-Za-z]+)/; |
$unikey=~/^([A-Za-z]+)/; |
Line 5337 sub check_switchserver {
|
Line 5803 sub check_switchserver {
|
my @ids=&Apache::lonnet::current_machine_ids(); |
my @ids=&Apache::lonnet::current_machine_ids(); |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
if (!$allowed) { |
if (!$allowed) { |
$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/">'.&mt('Switch Server').'</a>'; |
$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/&destinationurl=/adm/domainprefs">'.&mt('Switch Server').'</a>'; |
} |
} |
return $switchserver; |
return $switchserver; |
} |
} |
Line 5385 sub modify_quotas {
|
Line 5851 sub modify_quotas {
|
} else { |
} else { |
if ($key =~ /^form\.quota_(.+)$/) { |
if ($key =~ /^form\.quota_(.+)$/) { |
$confhash{'defaultquota'}{$1} = $env{$key}; |
$confhash{'defaultquota'}{$1} = $env{$key}; |
} |
} elsif ($key =~ /^form\.authorquota_(.+)$/) { |
if ($key =~ /^form\.\Q$context\E_(.+)$/) { |
$confhash{'authorquota'}{$1} = $env{$key}; |
|
} elsif ($key =~ /^form\.\Q$context\E_(.+)$/) { |
@{$toolshash{$1}} = &Apache::loncommon::get_env_multiple($key); |
@{$toolshash{$1}} = &Apache::loncommon::get_env_multiple($key); |
} |
} |
} |
} |
Line 5412 sub modify_quotas {
|
Line 5879 sub modify_quotas {
|
} |
} |
} else { |
} else { |
$confhash{'defaultquota'}{'default'} = $env{'form.defaultquota'}; |
$confhash{'defaultquota'}{'default'} = $env{'form.defaultquota'}; |
|
$confhash{'authorquota'}{'default'} = $env{'form.authorquota'}; |
} |
} |
foreach my $item (@usertools) { |
foreach my $item (@usertools) { |
foreach my $type (@{$types},'default','_LC_adv') { |
foreach my $type (@{$types},'default','_LC_adv') { |
Line 5499 sub modify_quotas {
|
Line 5967 sub modify_quotas {
|
} |
} |
} |
} |
} |
} |
|
if (ref($domconfig{'quotas'}{'authorquota'}) eq 'HASH') { |
|
foreach my $key (keys(%{$domconfig{'quotas'}{'authorquota'}})) { |
|
if (exists($confhash{'authorquota'}{$key})) { |
|
if ($confhash{'authorquota'}{$key} ne $domconfig{'quotas'}{'authorquota'}{$key}) { |
|
$changes{'authorquota'}{$key} = 1; |
|
} |
|
} else { |
|
$confhash{'authorquota'}{$key} = $domconfig{'quotas'}{'authorquota'}{$key}; |
|
} |
|
} |
|
} |
} |
} |
if (ref($confhash{'defaultquota'}) eq 'HASH') { |
if (ref($confhash{'defaultquota'}) eq 'HASH') { |
foreach my $key (keys(%{$confhash{'defaultquota'}})) { |
foreach my $key (keys(%{$confhash{'defaultquota'}})) { |
Line 5517 sub modify_quotas {
|
Line 5996 sub modify_quotas {
|
} |
} |
} |
} |
} |
} |
|
if (ref($confhash{'authorquota'}) eq 'HASH') { |
|
foreach my $key (keys(%{$confhash{'authorquota'}})) { |
|
if (ref($domconfig{'quotas'}) eq 'HASH') { |
|
if (ref($domconfig{'quotas'}{'authorquota'}) eq 'HASH') { |
|
if (!exists($domconfig{'quotas'}{'authorquota'}{$key})) { |
|
$changes{'authorquota'}{$key} = 1; |
|
} |
|
} else { |
|
$changes{'authorquota'}{$key} = 1; |
|
} |
|
} else { |
|
$changes{'authorquota'}{$key} = 1; |
|
} |
|
} |
|
} |
} |
} |
|
|
if ($context eq 'requestauthor') { |
if ($context eq 'requestauthor') { |
Line 5538 sub modify_quotas {
|
Line 6032 sub modify_quotas {
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
|
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
unless (($context eq 'requestcourses') || |
unless (($context eq 'requestcourses') || |
($context eq 'requestauthor')) { |
($context eq 'requestauthor')) { |
if (ref($changes{'defaultquota'}) eq 'HASH') { |
if (ref($changes{'defaultquota'}) eq 'HASH') { |
$resulttext .= '<li>'.&mt('Portfolio default quotas').'<ul>'; |
$resulttext .= '<li>'.&mt('Portfolio default quotas').'<ul>'; |
Line 5553 sub modify_quotas {
|
Line 6047 sub modify_quotas {
|
} |
} |
$resulttext .= '</ul></li>'; |
$resulttext .= '</ul></li>'; |
} |
} |
|
if (ref($changes{'authorquota'}) eq 'HASH') { |
|
$resulttext .= '<li>'.&mt('Authoring space default quotas').'<ul>'; |
|
foreach my $type (@{$types},'default') { |
|
if (defined($changes{'authorquota'}{$type})) { |
|
my $typetitle = $usertypes->{$type}; |
|
if ($type eq 'default') { |
|
$typetitle = $othertitle; |
|
} |
|
$resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$typetitle,$confhash{'authorquota'}{$type}).'</li>'; |
|
} |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
} |
} |
my %newenv; |
my %newenv; |
foreach my $item (@usertools) { |
foreach my $item (@usertools) { |
my (%haschgs,%inconf); |
my (%haschgs,%inconf); |
if ($context eq 'requestauthor') { |
if ($context eq 'requestauthor') { |
%haschgs = %changes; |
%haschgs = %changes; |
%inconf = %confhash; |
%inconf = %confhash; |
} else { |
} else { |
if (ref($changes{$item}) eq 'HASH') { |
if (ref($changes{$item}) eq 'HASH') { |
%haschgs = %{$changes{$item}}; |
%haschgs = %{$changes{$item}}; |
Line 5573 sub modify_quotas {
|
Line 6080 sub modify_quotas {
|
&Apache::lonnet::usertools_access($env{'user.name'}, |
&Apache::lonnet::usertools_access($env{'user.name'}, |
$env{'user.domain'}, |
$env{'user.domain'}, |
$item,'reload',$context); |
$item,'reload',$context); |
if (($context eq 'requestcourses') || |
if (($context eq 'requestcourses') || |
($context eq 'requestauthor')) { |
($context eq 'requestauthor')) { |
if ($env{'environment.canrequest.'.$item} ne $newacc) { |
if ($env{'environment.canrequest.'.$item} ne $newacc) { |
$newenv{'environment.canrequest.'.$item} = $newacc; |
$newenv{'environment.canrequest.'.$item} = $newacc; |
Line 5607 sub modify_quotas {
|
Line 6114 sub modify_quotas {
|
$cond = $conditions{$inconf{$type}}; |
$cond = $conditions{$inconf{$type}}; |
} |
} |
$resulttext .= '<li>'.&mt('Set to be available to [_1].',$typetitle).' '.$cond.'</li>'; |
$resulttext .= '<li>'.&mt('Set to be available to [_1].',$typetitle).' '.$cond.'</li>'; |
|
} elsif ($context eq 'requestauthor') { |
|
$resulttext .= '<li>'.&mt('Set to "[_1]" for "[_2]".', |
|
$titles{$inconf{$type}},$typetitle); |
|
|
} else { |
} else { |
$resulttext .= '<li>'.&mt('Set to be available to [_1]',$typetitle).'</li>'; |
$resulttext .= '<li>'.&mt('Set to be available to [_1]',$typetitle).'</li>'; |
} |
} |
Line 5662 sub modify_quotas {
|
Line 6173 sub modify_quotas {
|
} |
} |
|
|
sub modify_autoenroll { |
sub modify_autoenroll { |
my ($dom,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
my ($resulttext,%changes); |
my ($resulttext,%changes); |
my %currautoenroll; |
my %currautoenroll; |
if (ref($domconfig{'autoenroll'}) eq 'HASH') { |
if (ref($domconfig{'autoenroll'}) eq 'HASH') { |
Line 5730 sub modify_autoenroll {
|
Line 6241 sub modify_autoenroll {
|
if ($changes{'coowners'}) { |
if ($changes{'coowners'}) { |
$resulttext .= '<li>'.&mt("$title{'coowners'} set to $offon[$env{'form.autoassign_coowners'}]").'</li>'; |
$resulttext .= '<li>'.&mt("$title{'coowners'} set to $offon[$env{'form.autoassign_coowners'}]").'</li>'; |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
|
$$lastactref = 'update'; |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
Line 5980 sub modify_autocreate {
|
Line 6492 sub modify_autocreate {
|
foreach my $item (@types) { |
foreach my $item (@types) { |
if ($changes{$item}) { |
if ($changes{$item}) { |
my $newtxt = $offon[$newvals{$item}]; |
my $newtxt = $offon[$newvals{$item}]; |
$resulttext .= '<li>'.&mt("$title{$item} set to [_1]$newtxt [_2]",'<b>','</b>').'</li>'; |
$resulttext .= '<li>'. |
|
&mt("$title{$item} set to [_1]$newtxt [_2]", |
|
'<b>','</b>'). |
|
'</li>'; |
} |
} |
} |
} |
if ($changes{'xmldc'}) { |
if ($changes{'xmldc'}) { |
my ($dcname,$dcdom) = split(':',$newvals{'xmldc'}); |
my ($dcname,$dcdom) = split(':',$newvals{'xmldc'}); |
my $newtxt = &Apache::loncommon::plainname($dcname,$dcdom); |
my $newtxt = &Apache::loncommon::plainname($dcname,$dcdom); |
$resulttext .= '<li>'.&mt("$title{'xmldc'} set to [_1]$newtxt [_2]",'<b>','</b>').'</li>'; |
$resulttext .= '<li>'.&mt("$title{'xmldc'} set to [_1]",'<b>'.$newtxt.'</b>').'</li>'; |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
Line 6132 sub modify_directorysrch {
|
Line 6647 sub modify_directorysrch {
|
} else { |
} else { |
$chgtext =~ s/\; $//; |
$chgtext =~ s/\; $//; |
} |
} |
$resulttext .= '<li>'.&mt("Users from domain '<span class=\"LC_cusr_emph\">[_1]</span>' permitted to search the institutional directory set to: [_2]",$dom,$chgtext).'</li>'; |
$resulttext .= |
|
'<li>'. |
|
&mt("Users from domain '[_1]' permitted to search the institutional directory set to: [_2]", |
|
'<span class="LC_cusr_emph">'.$dom.'</span>',$chgtext). |
|
'</li>'; |
} |
} |
} |
} |
} |
} |
Line 6160 sub modify_directorysrch {
|
Line 6679 sub modify_directorysrch {
|
} |
} |
} |
} |
$chgtext =~ s/\; $//; |
$chgtext =~ s/\; $//; |
$resulttext .= '<li>'.&mt("$title{'searchtypes'} set to: \"[_1]\"",$chgtext).'</li>'; |
$resulttext .= '<li>'.&mt($title{'searchtypes'}.' set to: "[_1]"',$chgtext).'</li>'; |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
Line 6174 sub modify_directorysrch {
|
Line 6693 sub modify_directorysrch {
|
} |
} |
|
|
sub modify_contacts { |
sub modify_contacts { |
my ($dom,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
my ($resulttext,%currsetting,%newsetting,%changes,%contacts_hash); |
my ($resulttext,%currsetting,%newsetting,%changes,%contacts_hash); |
if (ref($domconfig{'contacts'}) eq 'HASH') { |
if (ref($domconfig{'contacts'}) eq 'HASH') { |
foreach my $key (keys(%{$domconfig{'contacts'}})) { |
foreach my $key (keys(%{$domconfig{'contacts'}})) { |
Line 6184 sub modify_contacts {
|
Line 6703 sub modify_contacts {
|
my (%others,%to,%bcc); |
my (%others,%to,%bcc); |
my @contacts = ('supportemail','adminemail'); |
my @contacts = ('supportemail','adminemail'); |
my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail', |
my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail', |
'requestsmail'); |
'requestsmail','updatesmail','idconflictsmail'); |
|
my @toggles = ('reporterrors','reportupdates'); |
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 6206 sub modify_contacts {
|
Line 6726 sub modify_contacts {
|
$to{$item} = $env{'form.'.$item}; |
$to{$item} = $env{'form.'.$item}; |
$contacts_hash{'contacts'}{$item} = $to{$item}; |
$contacts_hash{'contacts'}{$item} = $to{$item}; |
} |
} |
|
foreach my $item (@toggles) { |
|
if ($env{'form.'.$item} =~ /^(0|1)$/) { |
|
$contacts_hash{'contacts'}{$item} = $env{'form.'.$item}; |
|
} |
|
} |
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 6240 sub modify_contacts {
|
Line 6765 sub modify_contacts {
|
$default{'helpdeskmail'} = 'supportemail'; |
$default{'helpdeskmail'} = 'supportemail'; |
$default{'lonstatusmail'} = 'adminemail'; |
$default{'lonstatusmail'} = 'adminemail'; |
$default{'requestsmail'} = 'adminemail'; |
$default{'requestsmail'} = 'adminemail'; |
|
$default{'updatesmail'} = '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})) { |
Line 6260 sub modify_contacts {
|
Line 6786 sub modify_contacts {
|
} |
} |
} |
} |
} |
} |
|
foreach my $item (@toggles) { |
|
if (($env{'form.'.$item} == 1) && ($currsetting{$item} == 0)) { |
|
$changes{$item} = 1; |
|
} elsif ((!$env{'form.'.$item}) && |
|
(($currsetting{$item} eq '') || ($currsetting{$item} == 1))) { |
|
$changes{$item} = 1; |
|
} |
|
} |
my $putresult = &Apache::lonnet::put_dom('configuration',\%contacts_hash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%contacts_hash, |
$dom); |
$dom); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
|
&Apache::loncommon::devalidate_domconfig_cache($dom); |
|
$$lastactref = 'update'; |
my ($titles,$short_titles) = &contact_titles(); |
my ($titles,$short_titles) = &contact_titles(); |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
Line 6294 sub modify_contacts {
|
Line 6830 sub modify_contacts {
|
$resulttext .= '</li>'; |
$resulttext .= '</li>'; |
} |
} |
} |
} |
|
my @offon = ('off','on'); |
|
if ($changes{'reporterrors'}) { |
|
$resulttext .= '<li>'. |
|
&mt('E-mail error reports to [_1] set to "'. |
|
$offon[$env{'form.reporterrors'}].'".', |
|
&Apache::loncommon::modal_link('http://loncapa.org/core.html', |
|
&mt('LON-CAPA core group - MSU'),600,500)). |
|
'</li>'; |
|
} |
|
if ($changes{'reportupdates'}) { |
|
$resulttext .= '<li>'. |
|
&mt('E-mail record of completed LON-CAPA updates to [_1] set to "'. |
|
$offon[$env{'form.reportupdates'}].'".', |
|
&Apache::loncommon::modal_link('http://loncapa.org/core.html', |
|
&mt('LON-CAPA core group - MSU'),600,500)). |
|
'</li>'; |
|
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
$resulttext = &mt('No changes made to contact information'); |
$resulttext = &mt('No changes made to contact information'); |
Line 6594 sub modify_usercreation {
|
Line 7147 sub modify_usercreation {
|
if ($captchas{$cancreate{$type}}) { |
if ($captchas{$cancreate{$type}}) { |
$chgtext .= &mt("Validation for self-creation screen set to $captchas{$cancreate{$type}}."); |
$chgtext .= &mt("Validation for self-creation screen set to $captchas{$cancreate{$type}}."); |
} else { |
} else { |
$chgtext .= &mt('Validation for self-creation screen set to unknown type.'); |
$chgtext .= &mt('Validation for self-creation screen set to unknown type.'); |
} |
} |
} |
} |
} elsif ($type eq 'recaptchakeys') { |
} elsif ($type eq 'recaptchakeys') { |
Line 6722 sub process_captcha {
|
Line 7275 sub process_captcha {
|
$newsettings->{'captcha'} = 'original'; |
$newsettings->{'captcha'} = 'original'; |
} |
} |
if ($current->{'captcha'} ne $newsettings->{'captcha'}) { |
if ($current->{'captcha'} ne $newsettings->{'captcha'}) { |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
if ($container eq 'cancreate') { |
push(@{$changes->{'cancreate'}},'captcha'); |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
} elsif (!defined($changes->{'cancreate'})) { |
push(@{$changes->{'cancreate'}},'captcha'); |
$changes->{'cancreate'} = ['captcha']; |
} elsif (!defined($changes->{'cancreate'})) { |
|
$changes->{'cancreate'} = ['captcha']; |
|
} |
|
} else { |
|
$changes->{'captcha'} = 1; |
} |
} |
} |
} |
my ($newpub,$newpriv,$currpub,$currpriv); |
my ($newpub,$newpriv,$currpub,$currpriv); |
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; |
|
$newpriv =~ s/\W//g; |
|
$newsettings->{'recaptchakeys'} = { |
|
public => $newpub, |
|
private => $newpriv, |
|
}; |
} |
} |
$newsettings->{'recaptchakeys'} = { |
|
public => $newpub, |
|
private => $newpriv, |
|
}; |
|
if (ref($current->{'recaptchakeys'}) eq 'HASH') { |
if (ref($current->{'recaptchakeys'}) eq 'HASH') { |
$currpub = $current->{'recaptchakeys'}{'public'}; |
$currpub = $current->{'recaptchakeys'}{'public'}; |
$currpriv = $current->{'recaptchakeys'}{'private'}; |
$currpriv = $current->{'recaptchakeys'}{'private'}; |
|
unless ($newsettings->{'captcha'} eq 'recaptcha') { |
|
$newsettings->{'recaptchakeys'} = { |
|
public => '', |
|
private => '', |
|
} |
|
} |
} |
} |
if (($newpub ne $currpub) || ($newpriv ne $currpriv)) { |
if (($newpub ne $currpub) || ($newpriv ne $currpriv)) { |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
if ($container eq 'cancreate') { |
push(@{$changes->{'cancreate'}},'recaptchakeys'); |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
} elsif (!defined($changes->{'cancreate'})) { |
push(@{$changes->{'cancreate'}},'recaptchakeys'); |
$changes->{'cancreate'} = ['recaptchakeys']; |
} elsif (!defined($changes->{'cancreate'})) { |
|
$changes->{'cancreate'} = ['recaptchakeys']; |
|
} |
|
} else { |
|
$changes->{'recaptchakeys'} = 1; |
} |
} |
} |
} |
return; |
return; |
Line 6872 sub modify_usermodification {
|
Line 7441 sub modify_usermodification {
|
} |
} |
|
|
sub modify_defaults { |
sub modify_defaults { |
my ($dom,$r) = @_; |
my ($dom,$r,%domconfig) = @_; |
my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors); |
my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
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'); |
Line 6958 sub modify_defaults {
|
Line 7527 sub modify_defaults {
|
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 ($changes{'auth_def'} || $changes{'auth_arg_def'} || $changes{'lang_def'} || $changes{'datelocale_def'}) { |
if ($changes{'auth_def'} || $changes{'auth_arg_def'} || $changes{'lang_def'} || $changes{'datelocale_def'}) { |
my $sysmail = $r->dir_config('lonSysEMail'); |
my $notify = 1; |
&Apache::lonmsg::sendemail($sysmail,"LON-CAPA Domain Settings Change - $dom",$mailmsgtext); |
if (ref($domconfig{'contacts'}) eq 'HASH') { |
|
if ($domconfig{'contacts'}{'reportupdates'} == 0) { |
|
$notify = 0; |
|
} |
|
} |
|
if ($notify) { |
|
&Apache::lonmsg::sendemail('installrecord@loncapa.org', |
|
"LON-CAPA Domain Settings Change - $dom", |
|
$mailmsgtext); |
|
} |
} |
} |
} else { |
} else { |
$resulttext = &mt('No changes made to default authentication/language/timezone settings'); |
$resulttext = &mt('No changes made to default authentication/language/timezone settings'); |
Line 6979 sub modify_defaults {
|
Line 7557 sub modify_defaults {
|
} |
} |
|
|
sub modify_scantron { |
sub modify_scantron { |
my ($r,$dom,$confname,%domconfig) = @_; |
my ($r,$dom,$confname,$lastactref,%domconfig) = @_; |
my ($resulttext,%confhash,%changes,$errors); |
my ($resulttext,%confhash,%changes,$errors); |
my $custom = 'custom.tab'; |
my $custom = 'custom.tab'; |
my $default = 'default.tab'; |
my $default = 'default.tab'; |
Line 7040 sub modify_scantron {
|
Line 7618 sub modify_scantron {
|
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
|
$$lastactref = 'update'; |
} else { |
} else { |
$resulttext = &mt('No changes made to bubblesheet format file'); |
$resulttext = &mt('No changes made to bubblesheet format file'); |
} |
} |
Line 7408 sub modify_serverstatuses {
|
Line 7987 sub modify_serverstatuses {
|
sub modify_helpsettings { |
sub modify_helpsettings { |
my ($r,$dom,$confname,%domconfig) = @_; |
my ($r,$dom,$confname,%domconfig) = @_; |
my ($resulttext,$errors,%changes,%helphash); |
my ($resulttext,$errors,%changes,%helphash); |
my $customhelpfile = $env{'form.loginhelpurl.filename'}; |
|
my $defaulthelpfile = '/adm/loginproblems.html'; |
|
my $defaulttext = &mt('Default in use'); |
|
my $servadm = $r->dir_config('lonAdmEMail'); |
|
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
|
my %defaultchecked = ('submitbugs' => 'on'); |
my %defaultchecked = ('submitbugs' => 'on'); |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
my %title = ( |
|
submitbugs => 'Display link for users to submit a bug', |
|
loginhelpurl => 'Unauthenticated login help page set to custom file' |
|
); |
|
my @toggles = ('submitbugs'); |
my @toggles = ('submitbugs'); |
$helphash{'helpsettings'} = {}; |
|
if (ref($domconfig{'helpsettings'}) ne 'HASH') { |
|
if ($domconfig{'helpsettings'} eq '') { |
|
$domconfig{'helpsettings'} = {}; |
|
} |
|
} |
|
if (ref($domconfig{'helpsettings'}) eq 'HASH') { |
if (ref($domconfig{'helpsettings'}) eq 'HASH') { |
foreach my $item (@toggles) { |
foreach my $item (@toggles) { |
if ($defaultchecked{$item} eq 'on') { |
if ($defaultchecked{$item} eq 'on') { |
Line 7445 sub modify_helpsettings {
|
Line 8009 sub modify_helpsettings {
|
$changes{$item} = 1; |
$changes{$item} = 1; |
} |
} |
} |
} |
if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) { |
if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) { |
$helphash{'helpsettings'}{$item} = $env{'form.'.$item}; |
$helphash{'helpsettings'}{$item} = $env{'form.'.$item}; |
} |
} |
} |
} |
if ($customhelpfile ne '') { |
|
my $error; |
|
if ($configuserok eq 'ok') { |
|
if ($switchserver) { |
|
$error = &mt("Upload of custom help file is not permitted to this server: [_1]",$switchserver); |
|
} else { |
|
if ($author_ok eq 'ok') { |
|
my ($result,$loginhelpurl) = &publishlogo($r,'upload','loginhelpurl',$dom, |
|
$confname,'help','','',$customhelpfile); |
|
if ($result eq 'ok') { |
|
$helphash{'helpsettings'}{'loginhelpurl'} = $loginhelpurl; |
|
$changes{'loginhelpurl'} = 1; |
|
} else { |
|
$error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$customhelpfile,$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].",$customhelpfile,$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].",$customhelpfile,$confname,$dom,$configuserok); |
|
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} |
|
if ($domconfig{'helpsettings'}{'loginhelpurl'} ne '') { |
|
if ($env{'form.loginhelpurl_del'}) { |
|
$helphash{'helpsettings'}{'loginhelpurl'} = ''; |
|
$changes{'loginhelpurl'} = 1; |
|
} |
|
} |
|
} |
} |
my $putresult; |
my $putresult; |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
$putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom); |
$putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom); |
} else { |
if ($putresult eq 'ok') { |
$putresult = 'ok'; |
|
} |
|
if ($putresult eq 'ok') { |
|
if (keys(%changes) > 0) { |
|
$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 'submitbugs') { |
if ($item eq 'submitbugs') { |
Line 7498 sub modify_helpsettings {
|
Line 8025 sub modify_helpsettings {
|
&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>'; |
} |
} |
if ($item eq 'loginhelpurl') { |
|
if ($helphash{'helpsettings'}{'loginhelpurl'} eq '') { |
|
$resulttext .= '<li>'.&mt('custom log-in help file removed.').' '. |
|
&Apache::loncommon::modal_link($defaulthelpfile, |
|
$defaulttext,600,500).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&Apache::loncommon::modal_link( |
|
$helphash{'helpsettings'}{'loginhelpurl'}. |
|
'?inhibitmenu=yes', |
|
&mt('custom log-in help file'),600,500). |
|
'</li>'; |
|
} |
|
} |
|
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
$resulttext = &mt('No changes made to help settings'); |
$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>'; |
} |
} |
} else { |
|
$errors .= '<li><span class="LC_error">'.&mt('An error occurred storing the settings: [_1]', |
|
$putresult).'</span></li>'; |
|
} |
} |
if ($errors) { |
if ($errors) { |
$resulttext .= &mt('The following errors occurred: ').'<ul>'. |
$resulttext .= '<br />'.&mt('The following errors occurred: ').'<ul>'. |
$errors.'</ul>'; |
$errors.'</ul>'; |
} |
} |
return $resulttext; |
return $resulttext; |
Line 7531 sub modify_coursedefaults {
|
Line 8045 sub modify_coursedefaults {
|
my ($dom,%domconfig) = @_; |
my ($dom,%domconfig) = @_; |
my ($resulttext,$errors,%changes,%defaultshash); |
my ($resulttext,$errors,%changes,%defaultshash); |
my %defaultchecked = ('canuse_pdfforms' => 'off'); |
my %defaultchecked = ('canuse_pdfforms' => 'off'); |
my @offon = ('off','on'); |
|
my @toggles = ('canuse_pdfforms'); |
my @toggles = ('canuse_pdfforms'); |
|
my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial', |
|
'uploadquota_community'); |
|
my @types = ('official','unofficial','community'); |
|
my %staticdefaults = ( |
|
anonsurvey_threshold => 10, |
|
uploadquota => 500, |
|
); |
|
|
$defaultshash{'coursedefaults'} = {}; |
$defaultshash{'coursedefaults'} = {}; |
|
|
Line 7548 sub modify_coursedefaults {
|
Line 8068 sub modify_coursedefaults {
|
if (($domconfig{'coursedefaults'}{$item} eq '') && |
if (($domconfig{'coursedefaults'}{$item} eq '') && |
($env{'form.'.$item} eq '0')) { |
($env{'form.'.$item} eq '0')) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
} elsif ($domconfig{'coursdefaults'}{$item} ne $env{'form.'.$item}) { |
} elsif ($domconfig{'coursedefaults'}{$item} ne $env{'form.'.$item}) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
} |
} |
} elsif ($defaultchecked{$item} eq 'off') { |
} elsif ($defaultchecked{$item} eq 'off') { |
Line 7561 sub modify_coursedefaults {
|
Line 8081 sub modify_coursedefaults {
|
} |
} |
$defaultshash{'coursedefaults'}{$item} = $env{'form.'.$item}; |
$defaultshash{'coursedefaults'}{$item} = $env{'form.'.$item}; |
} |
} |
my $currdefresponder = $domconfig{'coursedefaults'}{'anonsurvey_threshold'}; |
foreach my $item (@numbers) { |
my $newdefresponder = $env{'form.anonsurvey_threshold'}; |
my ($currdef,$newdef); |
$newdefresponder =~ s/\D//g; |
$newdef = $env{'form.'.$item}; |
if ($newdefresponder eq '' || $newdefresponder < 1) { |
if ($item eq 'anonsurvey_threshold') { |
$newdefresponder = 1; |
$currdef = $domconfig{'coursedefaults'}{$item}; |
} |
$newdef =~ s/\D//g; |
$defaultshash{'coursedefaults'}{'anonsurvey_threshold'} = $newdefresponder; |
if ($newdef eq '' || $newdef < 1) { |
if ($currdefresponder ne $newdefresponder) { |
$newdef = 1; |
unless ($currdefresponder eq '' && $newdefresponder == 10) { |
} |
$changes{'anonsurvey_threshold'} = 1; |
$defaultshash{'coursedefaults'}{$item} = $newdef; |
|
} else { |
|
my ($type) = ($item =~ /^\Quploadquota_\E(\w+)$/); |
|
if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') { |
|
$currdef = $domconfig{'coursedefaults'}{'uploadquota'}{$type}; |
|
} |
|
$newdef =~ s/[^\w.\-]//g; |
|
$defaultshash{'coursedefaults'}{'uploadquota'}{$type} = $newdef; |
|
} |
|
if ($currdef ne $newdef) { |
|
my $staticdef; |
|
if ($item eq 'anonsurvey_threshold') { |
|
unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) { |
|
$changes{$item} = 1; |
|
} |
|
} else { |
|
unless (($currdef eq '') && ($newdef == $staticdefaults{'uploadquota'})) { |
|
$changes{'uploadquota'} = 1; |
|
} |
|
} |
|
} |
|
} |
|
my $officialcreds = $env{'form.official_credits'}; |
|
$officialcreds =~ s/^[^\d\.]//g; |
|
my $unofficialcreds = $env{'form.unofficial_credits'}; |
|
$unofficialcreds =~ s/^[^\d\.]//g; |
|
if (ref($domconfig{'coursedefaults'}{'coursecredits'} ne 'HASH') && |
|
($env{'form.coursecredits'} eq '1')) { |
|
$changes{'coursecredits'} = 1; |
|
} else { |
|
if (($domconfig{'coursedefaults'}{'coursecredits'}{'official'} ne $officialcreds) || |
|
($domconfig{'coursedefaults'}{'coursecredits'}{'unofficial'} ne $unofficialcreds)) { |
|
$changes{'coursecredits'} = 1; |
} |
} |
} |
} |
|
$defaultshash{'coursedefaults'}{'coursecredits'} = { |
|
official => $officialcreds, |
|
unofficial => $unofficialcreds, |
|
} |
} |
} |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
$dom); |
$dom); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
|
my %domdefaults; |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
if ($changes{'canuse_pdfforms'}) { |
if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'}) || ($changes{'uploadquota'})) { |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
%domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
$domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'}; |
if ($changes{'canuse_pdfforms'}) { |
|
$domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'}; |
|
} |
|
if ($changes{'coursecredits'}) { |
|
if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
|
$domdefaults{'officialcredits'} = |
|
$defaultshash{'coursedefaults'}{'coursecredits'}{'official'}; |
|
$domdefaults{'unofficialcredits'} = |
|
$defaultshash{'coursedefaults'}{'coursecredits'}{'unofficial'}; |
|
} |
|
} |
|
if ($changes{'uploadquota'}) { |
|
if (ref($defaultshash{'coursedefaults'}{'uploadquota'}) eq 'HASH') { |
|
foreach my $type (@types) { |
|
$domdefaults{$type.'quota'}=$defaultshash{'coursedefaults'}{'uploadquota'}{$type}; |
|
} |
|
} |
|
} |
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); |
} |
} |
Line 7593 sub modify_coursedefaults {
|
Line 8167 sub modify_coursedefaults {
|
$resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>'; |
$resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</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>'; |
|
} elsif ($item eq 'uploadquota') { |
|
if (ref($defaultshash{'coursedefaults'}{'uploadquota'}) eq 'HASH') { |
|
$resulttext .= '<li>'.&mt('Default quota for content uploaded to a course/community via Course Editor set as follows:').'<ul>'. |
|
'<li>'.&mt('Official courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'official'}.'</b>').'</li>'. |
|
'<li>'.&mt('Unofficial courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'unofficial'}.'</b>').'</li>'. |
|
'<li>'.&mt('Communities: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'community'}.'</b>').'</li>'. |
|
'</ul>'. |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Default quota for content uploaded via Course Editor remains default: [_1] MB',$staticdefaults{'uploadquota'}).'</li>'; |
|
} |
|
} elsif ($item eq 'coursecredits') { |
|
if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
|
if (($domdefaults{'officialcredits'} eq '') && |
|
($domdefaults{'unofficialcredits'} eq '')) { |
|
$resulttext .= '<li>'.&mt('Student credits not in use for courses in this domain').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Student credits can be set per course by a Domain Coordinator, with the following defaults applying:').'<ul>'. |
|
'<li>'.&mt('Official courses: [_1]',$defaultshash{'coursedefaults'}{'coursecredits'}{'official'}).'</li>'. |
|
'<li>'.&mt('Unofficial courses: [_1]',$defaultshash{'coursedefaults'}{'coursecredits'}{'unofficial'}).'</li>'. |
|
'</ul>'. |
|
'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('Student credits not in use for courses in this domain').'</li>'; |
|
} |
} |
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
Line 7886 sub modify_loadbalancing {
|
Line 8486 sub modify_loadbalancing {
|
my @sparestypes = ('primary','default'); |
my @sparestypes = ('primary','default'); |
my %typetitles = &sparestype_titles(); |
my %typetitles = &sparestype_titles(); |
my $resulttext; |
my $resulttext; |
if (keys(%servers) > 1) { |
my (%currbalancer,%currtargets,%currrules,%existing); |
my ($currbalancer,$currtargets,$currrules); |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
%existing = %{$domconfig{'loadbalancing'}}; |
$currbalancer = $domconfig{'loadbalancing'}{'lonhost'}; |
} |
$currtargets = $domconfig{'loadbalancing'}{'targets'}; |
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer, |
$currrules = $domconfig{'loadbalancing'}{'rules'}; |
\%currtargets,\%currrules); |
} else { |
my ($saveloadbalancing,%defaultshash,%changes); |
($currbalancer,$currtargets) = |
my ($alltypes,$othertypes,$titles) = |
&Apache::lonnet::get_lonbalancer_config(\%servers); |
&loadbalancing_titles($dom,$intdom,$usertypes,$types); |
} |
my %ruletitles = &offloadtype_text(); |
my ($saveloadbalancing,%defaultshash,%changes); |
my @deletions = &Apache::loncommon::get_env_multiple('form.loadbalancing_delete'); |
my ($alltypes,$othertypes,$titles) = |
for (my $i=0; $i<$env{'form.loadbalancing_total'}; $i++) { |
&loadbalancing_titles($dom,$intdom,$usertypes,$types); |
my $balancer = $env{'form.loadbalancing_lonhost_'.$i}; |
my %ruletitles = &offloadtype_text(); |
if ($balancer eq '') { |
my $balancer = $env{'form.loadbalancing_lonhost'}; |
next; |
if (!$servers{$balancer}) { |
} |
undef($balancer); |
if (!exists($servers{$balancer})) { |
} |
if (exists($currbalancer{$balancer})) { |
if ($currbalancer ne $balancer) { |
push(@{$changes{'delete'}},$balancer); |
$changes{'lonhost'} = 1; |
|
} |
|
$defaultshash{'loadbalancing'}{'lonhost'} = $balancer; |
|
if ($balancer ne '') { |
|
unless (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
|
$saveloadbalancing = 1; |
|
} |
} |
foreach my $sparetype (@sparestypes) { |
next; |
my @targets = &Apache::loncommon::get_env_multiple('form.loadbalancing_target_'.$sparetype); |
} |
my @offloadto; |
if ((@deletions > 0) && (grep(/^\Q$i\E$/,@deletions))) { |
foreach my $target (@targets) { |
push(@{$changes{'delete'}},$balancer); |
if (($servers{$target}) && ($target ne $balancer)) { |
next; |
if ($sparetype eq 'default') { |
} |
if (ref($defaultshash{'loadbalancing'}{'targets'}{'primary'}) eq 'ARRAY') { |
if (!exists($currbalancer{$balancer})) { |
next if (grep(/^\Q$target\E$/,@{$defaultshash{'loadbalancing'}{'targets'}{'primary'}})); |
push(@{$changes{'add'}},$balancer); |
} |
} |
} |
$defaultshash{'loadbalancing'}{$balancer}{'targets'}{'primary'} = []; |
unless(grep(/^\Q$target\E$/,@offloadto)) { |
$defaultshash{'loadbalancing'}{$balancer}{'targets'}{'default'} = []; |
push(@offloadto,$target); |
$defaultshash{'loadbalancing'}{$balancer}{'rules'} = {}; |
|
unless (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
|
$saveloadbalancing = 1; |
|
} |
|
foreach my $sparetype (@sparestypes) { |
|
my @targets = &Apache::loncommon::get_env_multiple('form.loadbalancing_target_'.$i.'_'.$sparetype); |
|
my @offloadto; |
|
foreach my $target (@targets) { |
|
if (($servers{$target}) && ($target ne $balancer)) { |
|
if ($sparetype eq 'default') { |
|
if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{'primary'}) eq 'ARRAY') { |
|
next if (grep(/^\Q$target\E$/,@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{'primary'}})); |
} |
} |
} |
} |
$defaultshash{'loadbalancing'}{'targets'}{$sparetype} = \@offloadto; |
unless(grep(/^\Q$target\E$/,@offloadto)) { |
|
push(@offloadto,$target); |
|
} |
} |
} |
} |
$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto; |
} else { |
|
foreach my $sparetype (@sparestypes) { |
|
$defaultshash{'loadbalancing'}{'targets'}{$sparetype} = []; |
|
} |
} |
} |
} |
if (ref($currtargets) eq 'HASH') { |
if (ref($currtargets{$balancer}) eq 'HASH') { |
foreach my $sparetype (@sparestypes) { |
foreach my $sparetype (@sparestypes) { |
if (ref($currtargets->{$sparetype}) eq 'ARRAY') { |
if (ref($currtargets{$balancer}{$sparetype}) eq 'ARRAY') { |
my @targetdiffs = &Apache::loncommon::compare_arrays($currtargets->{$sparetype},$defaultshash{'loadbalancing'}{'targets'}{$sparetype}); |
my @targetdiffs = &Apache::loncommon::compare_arrays($currtargets{$balancer}{$sparetype},$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}); |
if (@targetdiffs > 0) { |
if (@targetdiffs > 0) { |
$changes{'targets'} = 1; |
$changes{'curr'}{$balancer}{'targets'} = 1; |
} |
} |
} elsif (ref($defaultshash{'loadbalancing'}{'targets'}{$sparetype}) eq 'ARRAY') { |
} elsif (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') { |
if (@{$defaultshash{'loadbalancing'}{'targets'}{$sparetype}} > 0) { |
if (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}} > 0) { |
$changes{'targets'} = 1; |
$changes{'curr'}{$balancer}{'targets'} = 1; |
} |
} |
} |
} |
} |
} |
} else { |
} else { |
foreach my $sparetype (@sparestypes) { |
if (ref($defaultshash{'loadbalancing'}{$balancer}) eq 'HASH') { |
if (ref($defaultshash{'loadbalancing'}{'targets'}{$sparetype}) eq 'ARRAY') { |
foreach my $sparetype (@sparestypes) { |
if (@{$defaultshash{'loadbalancing'}{'targets'}{$sparetype}} > 0) { |
if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') { |
$changes{'targets'} = 1; |
if (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}} > 0) { |
|
$changes{'curr'}{$balancer}{'targets'} = 1; |
|
} |
} |
} |
} |
} |
} |
} |
} |
} |
my $ishomedom; |
my $ishomedom; |
if ($balancer ne '') { |
if (&Apache::lonnet::host_domain($balancer) eq $dom) { |
if (&Apache::lonnet::host_domain($balancer) eq $dom) { |
$ishomedom = 1; |
$ishomedom = 1; |
|
} |
|
} |
} |
if (ref($alltypes) eq 'ARRAY') { |
if (ref($alltypes) eq 'ARRAY') { |
foreach my $type (@{$alltypes}) { |
foreach my $type (@{$alltypes}) { |
my $rule; |
my $rule; |
if ($balancer ne '') { |
unless ((($type eq '_LC_external') || ($type eq '_LC_internetdom')) && |
unless ((($type eq '_LC_external') || ($type eq '_LC_internetdom')) && |
|
(!$ishomedom)) { |
(!$ishomedom)) { |
$rule = $env{'form.loadbalancing_rules_'.$type}; |
$rule = $env{'form.loadbalancing_rules_'.$i.'_'.$type}; |
} |
} |
if ($rule eq 'specific') { |
if ($rule eq 'specific') { |
$rule = $env{'form.loadbalancing_singleserver_'.$type}; |
$rule = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type}; |
} |
|
} |
} |
$defaultshash{'loadbalancing'}{'rules'}{$type} = $rule; |
$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type} = $rule; |
if (ref($currrules) eq 'HASH') { |
if (ref($currrules{$balancer}) eq 'HASH') { |
if ($rule ne $currrules->{$type}) { |
if ($rule ne $currrules{$balancer}{$type}) { |
$changes{'rules'}{$type} = 1; |
$changes{'curr'}{$balancer}{'rules'}{$type} = 1; |
} |
} |
} elsif ($rule ne '') { |
} elsif ($rule ne '') { |
$changes{'rules'}{$type} = 1; |
$changes{'curr'}{$balancer}{'rules'}{$type} = 1; |
} |
} |
} |
} |
} |
} |
my $nochgmsg = &mt('No changes made to Load Balancer settings.'); |
} |
if ((keys(%changes) > 0) || ($saveloadbalancing)) { |
my $nochgmsg = &mt('No changes made to Load Balancer settings.'); |
my $putresult = &Apache::lonnet::put_dom('configuration', |
if ((keys(%changes) > 0) || ($saveloadbalancing)) { |
\%defaultshash,$dom); |
unless (ref($defaultshash{'loadbalancing'}) eq 'HASH') { |
if ($putresult eq 'ok') { |
$defaultshash{'loadbalancing'} = {}; |
if (keys(%changes) > 0) { |
} |
if ($changes{'lonhost'}) { |
my $putresult = &Apache::lonnet::put_dom('configuration', |
if ($currbalancer ne '') { |
\%defaultshash,$dom); |
&Apache::lonnet::remote_devalidate_cache($currbalancer,'loadbalancing',$dom); |
if ($putresult eq 'ok') { |
} |
if (keys(%changes) > 0) { |
if ($balancer eq '') { |
if (ref($changes{'delete'}) eq 'ARRAY') { |
$resulttext .= '<li>'.&mt('Load Balancing with dedicated server discontinued').'</li>'; |
foreach my $balancer (sort(@{$changes{'delete'}})) { |
} else { |
$resulttext .= '<li>'.&mt('Load Balancing discontinued for: [_1]',$balancer).'</li>'; |
&Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom); |
|
$resulttext .= '<li>'.&mt('Dedicated Load Balancer server set to [_1]',$balancer); |
|
} |
|
} else { |
|
&Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom); |
&Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom); |
} |
} |
if (($changes{'targets'}) && ($balancer ne '')) { |
} |
my %offloadstr; |
if (ref($changes{'add'}) eq 'ARRAY') { |
foreach my $sparetype (@sparestypes) { |
foreach my $balancer (sort(@{$changes{'add'}})) { |
if (ref($defaultshash{'loadbalancing'}{'targets'}{$sparetype}) eq 'ARRAY') { |
$resulttext .= '<li>'.&mt('Load Balancing enabled for: [_1]',$balancer); |
if (@{$defaultshash{'loadbalancing'}{'targets'}{$sparetype}} > 0) { |
} |
$offloadstr{$sparetype} = join(', ',@{$defaultshash{'loadbalancing'}{'targets'}{$sparetype}}); |
} |
|
if (ref($changes{'curr'}) eq 'HASH') { |
|
foreach my $balancer (sort(keys(%{$changes{'curr'}}))) { |
|
if (ref($changes{'curr'}{$balancer}) eq 'HASH') { |
|
if ($changes{'curr'}{$balancer}{'targets'}) { |
|
my %offloadstr; |
|
foreach my $sparetype (@sparestypes) { |
|
if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') { |
|
if (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}} > 0) { |
|
$offloadstr{$sparetype} = join(', ',@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}}); |
|
} |
|
} |
} |
} |
} |
if (keys(%offloadstr) == 0) { |
} |
$resulttext .= '<li>'.&mt("Servers to which Load Balance server offloads set to 'None', by default").'</li>'; |
if (keys(%offloadstr) == 0) { |
|
$resulttext .= '<li>'.&mt("Servers to which Load Balance server offloads set to 'None', by default").'</li>'; |
|
} else { |
|
my $showoffload; |
|
foreach my $sparetype (@sparestypes) { |
|
$showoffload .= '<i>'.$typetitles{$sparetype}.'</i>: '; |
|
if (defined($offloadstr{$sparetype})) { |
|
$showoffload .= $offloadstr{$sparetype}; |
|
} else { |
} else { |
$showoffload .= &mt('None'); |
my $showoffload; |
|
foreach my $sparetype (@sparestypes) { |
|
$showoffload .= '<i>'.$typetitles{$sparetype}.'</i>: '; |
|
if (defined($offloadstr{$sparetype})) { |
|
$showoffload .= $offloadstr{$sparetype}; |
|
} else { |
|
$showoffload .= &mt('None'); |
|
} |
|
$showoffload .= (' 'x3); |
|
} |
|
$resulttext .= '<li>'.&mt('By default, Load Balancer: [_1] set to offload to - [_2]',$balancer,$showoffload).'</li>'; |
} |
} |
$showoffload .= (' 'x3); |
|
} |
} |
$resulttext .= '<li>'.&mt('By default, Load Balancer server set to offload to: [_1]',$showoffload).'</li>'; |
|
} |
} |
} |
if (ref($changes{'curr'}{$balancer}{'rules'}) eq 'HASH') { |
if ((ref($changes{'rules'}) eq 'HASH') && ($balancer ne '')) { |
if ((ref($alltypes) eq 'ARRAY') && (ref($titles) eq 'HASH')) { |
if ((ref($alltypes) eq 'ARRAY') && (ref($titles) eq 'HASH')) { |
foreach my $type (@{$alltypes}) { |
foreach my $type (@{$alltypes}) { |
if ($changes{'curr'}{$balancer}{'rules'}{$type}) { |
if ($changes{'rules'}{$type}) { |
my $rule = $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type}; |
my $rule = $defaultshash{'loadbalancing'}{'rules'}{$type}; |
my $balancetext; |
my $balancetext; |
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')) { |
$balancetext = $ruletitles{$rule}; |
$balancetext = $ruletitles{$rule}; |
} else { |
} else { |
$balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{'rules'}{$type}); |
$balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type}); |
|
} |
|
$resulttext .= '<li>'.&mt('Load Balancer: [_1] -- balancing for [_2] set to - "[_3]"',$balancer,$titles->{$type},$balancetext).'</li>'; |
} |
} |
$resulttext .= '<li>'.&mt('Load Balancing for [_1] set to: [_2]',$titles->{$type},$balancetext).'</li>'; |
|
} |
} |
} |
} |
} |
} |
|
&Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom); |
} |
} |
if ($resulttext ne '') { |
} |
$resulttext = &mt('Changes made:').'<ul>'.$resulttext.'</ul>'; |
if ($resulttext ne '') { |
} else { |
$resulttext = &mt('Changes made:').'<ul>'.$resulttext.'</ul>'; |
$resulttext = $nochgmsg; |
|
} |
|
} else { |
} else { |
$resulttext = $nochgmsg; |
$resulttext = $nochgmsg; |
if ($balancer ne '') { |
|
&Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom); |
|
} |
|
} |
} |
} else { |
} else { |
$resulttext = '<span class="LC_error">'. |
$resulttext = $nochgmsg; |
&mt('An error occurred: [_1]',$putresult).'</span>'; |
|
} |
} |
} else { |
} else { |
$resulttext = $nochgmsg; |
$resulttext = '<span class="LC_error">'. |
|
&mt('An error occurred: [_1]',$putresult).'</span>'; |
} |
} |
} else { |
} else { |
$resulttext = &mt('Load Balancing unavailable as this domain only has one server.'); |
$resulttext = $nochgmsg; |
} |
} |
return $resulttext; |
return $resulttext; |
} |
} |
Line 8104 sub recurse_cat_deletes {
|
Line 8710 sub recurse_cat_deletes {
|
delete($coursecategories->{$subitem}); |
delete($coursecategories->{$subitem}); |
$deletions->{$subitem} = 1; |
$deletions->{$subitem} = 1; |
&recurse_cat_deletes($subitem,$coursecategories,$deletions); |
&recurse_cat_deletes($subitem,$coursecategories,$deletions); |
} |
} |
} |
} |
} |
} |
return; |
return; |
Line 8112 sub recurse_cat_deletes {
|
Line 8718 sub recurse_cat_deletes {
|
|
|
sub get_active_dcs { |
sub get_active_dcs { |
my ($dom) = @_; |
my ($dom) = @_; |
my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']); |
my $now = time; |
|
my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc'],$now,$now); |
my %domcoords; |
my %domcoords; |
my $numdcs = 0; |
my $numdcs = 0; |
my $now = time; |
|
foreach my $server (keys(%dompersonnel)) { |
foreach my $server (keys(%dompersonnel)) { |
foreach my $user (sort(keys(%{$dompersonnel{$server}}))) { |
foreach my $user (sort(keys(%{$dompersonnel{$server}}))) { |
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user); |
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user); |
my ($end,$start) = split(':',$dompersonnel{$server}{$user}); |
$domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user}; |
if (($end eq '') || ($end == 0) || ($end > $now)) { |
|
if ($start <= $now) { |
|
$domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user}; |
|
} |
|
} |
|
} |
} |
} |
} |
return %domcoords; |
return %domcoords; |
} |
} |
|
|
sub active_dc_picker { |
sub active_dc_picker { |
my ($dom,$curr_dc) = @_; |
my ($dom,$numinrow,$inputtype,$name,%currhash) = @_; |
my %domcoords = &get_active_dcs($dom); |
my %domcoords = &get_active_dcs($dom); |
my @dcs = sort(keys(%domcoords)); |
my @domcoord = keys(%domcoords); |
my $numdcs = scalar(@dcs); |
if (keys(%currhash)) { |
my $datatable; |
foreach my $dc (keys(%currhash)) { |
my $numinrow = 2; |
unless (exists($domcoords{$dc})) { |
|
push(@domcoord,$dc); |
|
} |
|
} |
|
} |
|
@domcoord = sort(@domcoord); |
|
my $numdcs = scalar(@domcoord); |
|
my $rows = 0; |
|
my $table; |
if ($numdcs > 1) { |
if ($numdcs > 1) { |
$datatable = '<table>'; |
$table = '<table>'; |
for (my $i=0; $i<@dcs; $i++) { |
for (my $i=0; $i<@domcoord; $i++) { |
my $rem = $i%($numinrow); |
my $rem = $i%($numinrow); |
if ($rem == 0) { |
if ($rem == 0) { |
if ($i > 0) { |
if ($i > 0) { |
$datatable .= '</tr>'; |
$table .= '</tr>'; |
} |
} |
$datatable .= '<tr>'; |
$table .= '<tr>'; |
|
$rows ++; |
} |
} |
my $check = ' '; |
my $check = ''; |
if ($curr_dc eq '') { |
if ($inputtype eq 'radio') { |
if (!$i) { |
if (keys(%currhash) == 0) { |
$check = ' checked="checked" '; |
if (!$i) { |
|
$check = ' checked="checked"'; |
|
} |
|
} elsif (exists($currhash{$domcoord[$i]})) { |
|
$check = ' checked="checked"'; |
|
} |
|
} else { |
|
if (exists($currhash{$domcoord[$i]})) { |
|
$check = ' checked="checked"'; |
} |
} |
} elsif ($dcs[$i] eq $curr_dc) { |
|
$check = ' checked="checked" '; |
|
} |
} |
if ($i == @dcs - 1) { |
if ($i == @domcoord - 1) { |
my $colsleft = $numinrow - $rem; |
my $colsleft = $numinrow - $rem; |
if ($colsleft > 1) { |
if ($colsleft > 1) { |
$datatable .= '<td colspan="'.$colsleft.'">'; |
$table .= '<td class="LC_left_item" colspan="'.$colsleft.'">'; |
} else { |
} else { |
$datatable .= '<td>'; |
$table .= '<td class="LC_left_item">'; |
} |
} |
} else { |
} else { |
$datatable .= '<td>'; |
$table .= '<td class="LC_left_item">'; |
|
} |
|
my ($dcname,$dcdom) = split(':',$domcoord[$i]); |
|
my $user = &Apache::loncommon::plainname($dcname,$dcdom); |
|
$table .= '<span class="LC_nobreak"><label>'. |
|
'<input type="'.$inputtype.'" name="'.$name.'"'. |
|
' value="'.$domcoord[$i].'"'.$check.' />'.$user; |
|
if ($user ne $dcname.':'.$dcdom) { |
|
$table .= ' ('.$dcname.':'.$dcdom.')'. |
|
'</label></span></td>'; |
} |
} |
my ($dcname,$dcdom) = split(':',$dcs[$i]); |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="autocreate_xmldc"'. |
|
' value="'.$dcs[$i].'"'.$check.'/>'. |
|
&Apache::loncommon::plainname($dcname,$dcdom). |
|
'</label></span></td>'; |
|
} |
} |
$datatable .= '</tr></table>'; |
$table .= '</tr></table>'; |
} elsif (@dcs) { |
} elsif ($numdcs == 1) { |
$datatable .= '<input type="hidden" name="autocreate_dc" value="'. |
if ($inputtype eq 'radio') { |
$dcs[0].'" />'; |
$table .= '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'; |
|
} else { |
|
my $check; |
|
if (exists($currhash{$domcoord[0]})) { |
|
$check = ' checked="checked"'; |
|
} |
|
$table .= '<input type="checkbox" name="'.$name.'" '. |
|
'value="'.$domcoord[0].'"'.$check.' />'; |
|
$rows ++; |
|
} |
} |
} |
return ($numdcs,$datatable); |
return ($numdcs,$table,$rows); |
} |
} |
|
|
sub usersession_titles { |
sub usersession_titles { |
Line 8221 sub count_servers {
|
Line 8849 sub count_servers {
|
} |
} |
|
|
sub lonbalance_targets_js { |
sub lonbalance_targets_js { |
my ($dom,$types,$servers) = @_; |
my ($dom,$types,$servers,$settings) = @_; |
my $select = &mt('Select'); |
my $select = &mt('Select'); |
my ($alltargets,$allishome,$allinsttypes,@alltypes); |
my ($alltargets,$allishome,$allinsttypes,@alltypes); |
if (ref($servers) eq 'HASH') { |
if (ref($servers) eq 'HASH') { |
Line 8243 sub lonbalance_targets_js {
|
Line 8871 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); |
|
if (ref($settings) eq 'HASH') { |
|
%existing = %{$settings}; |
|
} |
|
&get_loadbalancers_config($servers,\%existing,\%currbalancer, |
|
\%currtargets,\%currrules); |
|
my $balancers = join("','",sort(keys(%currbalancer))); |
return <<"END"; |
return <<"END"; |
|
|
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
|
|
function toggleTargets() { |
currBalancers = new Array('$balancers'); |
var balancer = document.display.loadbalancing_lonhost.options[document.display.loadbalancing_lonhost.selectedIndex].value; |
|
|
function toggleTargets(balnum) { |
|
var lonhostitem = document.getElementById('loadbalancing_lonhost_'+balnum); |
|
var prevhostitem = document.getElementById('loadbalancing_prevlonhost_'+balnum); |
|
var balancer = lonhostitem.options[lonhostitem.selectedIndex].value; |
|
var prevbalancer = prevhostitem.value; |
|
var baltotal = document.getElementById('loadbalancing_total').value; |
|
prevhostitem.value = balancer; |
|
if (prevbalancer != '') { |
|
var prevIdx = currBalancers.indexOf(prevbalancer); |
|
if (prevIdx != -1) { |
|
currBalancers.splice(prevIdx,1); |
|
} |
|
} |
if (balancer == '') { |
if (balancer == '') { |
hideSpares(); |
hideSpares(balnum); |
} else { |
} else { |
|
var currIdx = currBalancers.indexOf(balancer); |
|
if (currIdx == -1) { |
|
currBalancers.push(balancer); |
|
} |
var homedoms = new Array('$allishome'); |
var homedoms = new Array('$allishome'); |
var ishomedom = homedoms[document.display.loadbalancing_lonhost.selectedIndex]; |
var ishomedom = homedoms[lonhostitem.selectedIndex]; |
showSpares(balancer,ishomedom); |
showSpares(balancer,ishomedom,balnum); |
} |
} |
|
balancerChange(balnum,baltotal,'change',prevbalancer,balancer); |
return; |
return; |
} |
} |
|
|
function showSpares(balancer,ishomedom) { |
function showSpares(balancer,ishomedom,balnum) { |
var alltargets = new Array('$alltargets'); |
var alltargets = new Array('$alltargets'); |
var insttypes = new Array('$allinsttypes'); |
var insttypes = new Array('$allinsttypes'); |
var offloadtypes = new Array('primary','default'); |
var offloadtypes = new Array('primary','default'); |
|
|
document.getElementById('loadbalancing_targets').style.display='block'; |
document.getElementById('loadbalancing_targets_'+balnum).style.display='block'; |
document.getElementById('loadbalancing_disabled').style.display='none'; |
document.getElementById('loadbalancing_disabled_'+balnum).style.display='none'; |
|
|
for (var i=0; i<offloadtypes.length; i++) { |
for (var i=0; i<offloadtypes.length; i++) { |
var count = 0; |
var count = 0; |
for (var j=0; j<alltargets.length; j++) { |
for (var j=0; j<alltargets.length; j++) { |
if (alltargets[j] != balancer) { |
if (alltargets[j] != balancer) { |
document.getElementById('loadbalancing_target_'+offloadtypes[i]+'_'+count).value = alltargets[j]; |
var item = document.getElementById('loadbalancing_target_'+balnum+'_'+offloadtypes[i]+'_'+count); |
document.getElementById('loadbalancing_targettxt_'+offloadtypes[i]+'_'+count).style.textAlign='left'; |
item.value = alltargets[j]; |
document.getElementById('loadbalancing_targettxt_'+offloadtypes[i]+'_'+count).style.textFace='normal'; |
item.style.textAlign='left'; |
document.getElementById('loadbalancing_targettxt_'+offloadtypes[i]+'_'+count).innerHTML = alltargets[j]; |
item.style.textFace='normal'; |
|
document.getElementById('loadbalancing_targettxt_'+balnum+'_'+offloadtypes[i]+'_'+count).innerHTML = alltargets[j]; |
|
if (currBalancers.indexOf(alltargets[j]) == -1) { |
|
item.disabled = ''; |
|
} else { |
|
item.disabled = 'disabled'; |
|
item.checked = false; |
|
} |
count ++; |
count ++; |
} |
} |
} |
} |
Line 8283 function showSpares(balancer,ishomedom)
|
Line 8943 function showSpares(balancer,ishomedom)
|
for (var k=0; k<insttypes.length; k++) { |
for (var k=0; k<insttypes.length; k++) { |
if ((insttypes[k] == '_LC_external') || (insttypes[k] == '_LC_internetdom')) { |
if ((insttypes[k] == '_LC_external') || (insttypes[k] == '_LC_internetdom')) { |
if (ishomedom == 1) { |
if (ishomedom == 1) { |
document.getElementById('balanceruletitle_'+insttypes[k]).style.display='block'; |
document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='block'; |
document.getElementById('balancerule_'+insttypes[k]).style.display='block'; |
document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='block'; |
} else { |
} else { |
document.getElementById('balanceruletitle_'+insttypes[k]).style.display='none'; |
document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='none'; |
document.getElementById('balancerule_'+insttypes[k]).style.display='none'; |
document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='none'; |
|
|
} |
} |
} else { |
} else { |
document.getElementById('balanceruletitle_'+insttypes[k]).style.display='block'; |
document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='block'; |
document.getElementById('balancerule_'+insttypes[k]).style.display='block'; |
document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='block'; |
} |
} |
if ((insttypes[k] != '_LC_external') && |
if ((insttypes[k] != '_LC_external') && |
((insttypes[k] != '_LC_internetdom') || |
((insttypes[k] != '_LC_internetdom') || |
((insttypes[k] == '_LC_internetdom') && (ishomedom == 1)))) { |
((insttypes[k] == '_LC_internetdom') && (ishomedom == 1)))) { |
document.getElementById('loadbalancing_singleserver_'+insttypes[k]).options[0] = new Option("","",true,true); |
var item = document.getElementById('loadbalancing_singleserver_'+balnum+'_'+insttypes[k]); |
|
item.options.length = 0; |
|
item.options[0] = new Option("","",true,true); |
|
var idx = 0; |
for (var m=0; m<alltargets.length; m++) { |
for (var m=0; m<alltargets.length; m++) { |
var idx = m+1; |
if ((currBalancers.indexOf(alltargets[m]) == -1) && (alltargets[m] != balancer)) { |
if (alltargets[m] != balancer) { |
idx ++; |
document.getElementById('loadbalancing_singleserver_'+insttypes[k]).options[idx] = new Option(alltargets[m],alltargets[m],false,false); |
item.options[idx] = new Option(alltargets[m],alltargets[m],false,false); |
} |
} |
} |
} |
} |
} |
Line 8309 function showSpares(balancer,ishomedom)
|
Line 8971 function showSpares(balancer,ishomedom)
|
return; |
return; |
} |
} |
|
|
function hideSpares() { |
function hideSpares(balnum) { |
var alltargets = new Array('$alltargets'); |
var alltargets = new Array('$alltargets'); |
var insttypes = new Array('$allinsttypes'); |
var insttypes = new Array('$allinsttypes'); |
var offloadtypes = new Array('primary','default'); |
var offloadtypes = new Array('primary','default'); |
|
|
document.getElementById('loadbalancing_targets').style.display='none'; |
document.getElementById('loadbalancing_targets_'+balnum).style.display='none'; |
document.getElementById('loadbalancing_disabled').style.display='block'; |
document.getElementById('loadbalancing_disabled_'+balnum).style.display='block'; |
|
|
var total = alltargets.length - 1; |
var total = alltargets.length - 1; |
for (var i=0; i<offloadtypes; i++) { |
for (var i=0; i<offloadtypes; i++) { |
for (var j=0; j<total; j++) { |
for (var j=0; j<total; j++) { |
document.getElementById('loadbalancing_target_'+offloadtypes[i]+'_'+j).checked = false; |
document.getElementById('loadbalancing_target_'+balnum+'_'+offloadtypes[i]+'_'+j).checked = false; |
document.getElementById('loadbalancing_target_'+offloadtypes[i]+'_'+j).value = ''; |
document.getElementById('loadbalancing_target_'+balnum+'_'+offloadtypes[i]+'_'+j).value = ''; |
document.getElementById('loadbalancing_targettxt_'+offloadtypes[i]+'_'+j).innerHTML = ''; |
document.getElementById('loadbalancing_targettxt_'+balnum+'_'+offloadtypes[i]+'_'+j).innerHTML = ''; |
} |
} |
} |
} |
for (var k=0; k<insttypes.length; k++) { |
for (var k=0; k<insttypes.length; k++) { |
document.getElementById('balanceruletitle_'+insttypes[k]).style.display='none'; |
document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='none'; |
document.getElementById('balancerule_'+insttypes[k]).style.display='none'; |
document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='none'; |
if (insttypes[k] != '_LC_external') { |
if (insttypes[k] != '_LC_external') { |
document.getElementById('loadbalancing_singleserver_'+insttypes[k]).length = 0; |
document.getElementById('loadbalancing_singleserver_'+balnum+'_'+insttypes[k]).length = 0; |
document.getElementById('loadbalancing_singleserver_'+insttypes[k]).options[0] = new Option("","",true,true); |
document.getElementById('loadbalancing_singleserver_'+balnum+'_'+insttypes[k]).options[0] = new Option("","",true,true); |
} |
} |
} |
} |
return; |
return; |
} |
} |
|
|
function checkOffloads(item,type) { |
function checkOffloads(item,balnum,type) { |
var alltargets = new Array('$alltargets'); |
var alltargets = new Array('$alltargets'); |
var offloadtypes = new Array('primary','default'); |
var offloadtypes = new Array('primary','default'); |
if (item.checked) { |
if (item.checked) { |
Line 8348 function checkOffloads(item,type) {
|
Line 9010 function checkOffloads(item,type) {
|
other = offloadtypes[0]; |
other = offloadtypes[0]; |
} |
} |
for (var i=0; i<total; i++) { |
for (var i=0; i<total; i++) { |
var server = document.getElementById('loadbalancing_target_'+other+'_'+i).value; |
var server = document.getElementById('loadbalancing_target_'+balnum+'_'+other+'_'+i).value; |
if (server == item.value) { |
if (server == item.value) { |
if (document.getElementById('loadbalancing_target_'+other+'_'+i).checked) { |
if (document.getElementById('loadbalancing_target_'+balnum+'_'+other+'_'+i).checked) { |
document.getElementById('loadbalancing_target_'+other+'_'+i).checked = false; |
document.getElementById('loadbalancing_target_'+balnum+'_'+other+'_'+i).checked = false; |
} |
} |
} |
} |
} |
} |
Line 8359 function checkOffloads(item,type) {
|
Line 9021 function checkOffloads(item,type) {
|
return; |
return; |
} |
} |
|
|
function singleServerToggle(type) { |
function singleServerToggle(balnum,type) { |
var offloadtoSelIdx = document.getElementById('loadbalancing_singleserver_'+type).selectedIndex; |
var offloadtoSelIdx = document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).selectedIndex; |
if (offloadtoSelIdx == 0) { |
if (offloadtoSelIdx == 0) { |
document.getElementById('loadbalancing_rules_'+type+'_0').checked = true; |
document.getElementById('loadbalancing_rules_'+balnum+'_'+type+'_0').checked = true; |
document.getElementById('loadbalancing_singleserver_'+type).options[0].text = ''; |
document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).options[0].text = ''; |
|
|
} else { |
} else { |
document.getElementById('loadbalancing_rules_'+type+'_2').checked = true; |
document.getElementById('loadbalancing_rules_'+balnum+'_'+type+'_2').checked = true; |
document.getElementById('loadbalancing_singleserver_'+type).options[0].text = '$select'; |
document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).options[0].text = '$select'; |
} |
} |
return; |
return; |
} |
} |
|
|
function balanceruleChange(formname,type) { |
function balanceruleChange(formname,balnum,type) { |
if (type == '_LC_external') { |
if (type == '_LC_external') { |
return; |
return; |
} |
} |
var typesRules = getIndicesByName(formname,'loadbalancing_rules_'+type); |
var typesRules = getIndicesByName(formname,'loadbalancing_rules_'+balnum+'_'+type); |
for (var i=0; i<typesRules.length; i++) { |
for (var i=0; i<typesRules.length; i++) { |
if (formname.elements[typesRules[i]].checked) { |
if (formname.elements[typesRules[i]].checked) { |
if (formname.elements[typesRules[i]].value != 'specific') { |
if (formname.elements[typesRules[i]].value != 'specific') { |
document.getElementById('loadbalancing_singleserver_'+type).selectedIndex = 0; |
document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).selectedIndex = 0; |
document.getElementById('loadbalancing_singleserver_'+type).options[0].text = ''; |
document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).options[0].text = ''; |
} else { |
} else { |
document.getElementById('loadbalancing_singleserver_'+type).options[0].text = '$select'; |
document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).options[0].text = '$select'; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function balancerDeleteChange(balnum) { |
|
var hostitem = document.getElementById('loadbalancing_lonhost_'+balnum); |
|
var baltotal = document.getElementById('loadbalancing_total').value; |
|
var addtarget; |
|
var removetarget; |
|
var action = 'delete'; |
|
if (document.getElementById('loadbalancing_delete_'+balnum)) { |
|
var lonhost = hostitem.value; |
|
var currIdx = currBalancers.indexOf(lonhost); |
|
if (document.getElementById('loadbalancing_delete_'+balnum).checked) { |
|
if (currIdx != -1) { |
|
currBalancers.splice(currIdx,1); |
|
} |
|
addtarget = lonhost; |
|
} else { |
|
if (currIdx == -1) { |
|
currBalancers.push(lonhost); |
|
} |
|
removetarget = lonhost; |
|
action = 'undelete'; |
|
} |
|
balancerChange(balnum,baltotal,action,addtarget,removetarget); |
|
} |
|
return; |
|
} |
|
|
|
function balancerChange(balnum,baltotal,action,addtarget,removetarget) { |
|
if (baltotal > 1) { |
|
var offloadtypes = new Array('primary','default'); |
|
var alltargets = new Array('$alltargets'); |
|
var insttypes = new Array('$allinsttypes'); |
|
for (var i=0; i<baltotal; i++) { |
|
if (i != balnum) { |
|
for (var j=0; j<offloadtypes.length; j++) { |
|
var total = alltargets.length - 1; |
|
for (var k=0; k<total; k++) { |
|
var serveritem = document.getElementById('loadbalancing_target_'+i+'_'+offloadtypes[j]+'_'+k); |
|
var server = serveritem.value; |
|
if ((action == 'delete') || (action == 'change' && addtarget != '')) { |
|
if (server == addtarget) { |
|
serveritem.disabled = ''; |
|
} |
|
} |
|
if ((action == 'undelete') || (action == 'change' && removetarget != '')) { |
|
if (server == removetarget) { |
|
serveritem.disabled = 'disabled'; |
|
serveritem.checked = false; |
|
} |
|
} |
|
} |
|
} |
|
for (var j=0; j<insttypes.length; j++) { |
|
if (insttypes[j] != '_LC_external') { |
|
if (document.getElementById('loadbalancing_singleserver_'+i+'_'+insttypes[j])) { |
|
var singleserver = document.getElementById('loadbalancing_singleserver_'+i+'_'+insttypes[j]); |
|
var currSel = singleserver.selectedIndex; |
|
var currVal = singleserver.options[currSel].value; |
|
if ((action == 'delete') || (action == 'change' && addtarget != '')) { |
|
var numoptions = singleserver.options.length; |
|
var needsnew = 1; |
|
for (var k=0; k<numoptions; k++) { |
|
if (singleserver.options[k] == addtarget) { |
|
needsnew = 0; |
|
break; |
|
} |
|
} |
|
if (needsnew == 1) { |
|
singleserver.options[numoptions] = new Option(addtarget,addtarget,false,false); |
|
} |
|
} |
|
if ((action == 'undelete') || (action == 'change' && removetarget != '')) { |
|
singleserver.options.length = 0; |
|
if ((currVal) && (currVal != removetarget)) { |
|
singleserver.options[0] = new Option("","",false,false); |
|
} else { |
|
singleserver.options[0] = new Option("","",true,true); |
|
} |
|
var idx = 0; |
|
for (var m=0; m<alltargets.length; m++) { |
|
if (currBalancers.indexOf(alltargets[m]) == -1) { |
|
idx ++; |
|
if (currVal == alltargets[m]) { |
|
singleserver.options[idx] = new Option(alltargets[m],alltargets[m],true,true); |
|
} else { |
|
singleserver.options[idx] = new Option(alltargets[m],alltargets[m],false,false); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
} |
} |
} |
} |
} |
} |
Line 8572 END
|
Line 9332 END
|
|
|
} |
} |
|
|
|
sub credits_js { |
|
return <<"END"; |
|
|
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
|
|
function toggleCredits(domForm) { |
|
if (document.getElementById('credits')) { |
|
creditsitem = document.getElementById('credits'); |
|
var creditsLength = domForm.coursecredits.length; |
|
if (creditsLength) { |
|
var currval; |
|
for (var i=0; i<creditsLength; i++) { |
|
if (domForm.coursecredits[i].checked) { |
|
currval = domForm.coursecredits[i].value; |
|
} |
|
} |
|
if (currval == 1) { |
|
creditsitem.style.display = 'block'; |
|
} else { |
|
creditsitem.style.display = 'none'; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
// ]]> |
|
</script> |
|
|
|
END |
|
|
|
} |
|
|
sub captcha_phrases { |
sub captcha_phrases { |
return &Apache::lonlocal::texthash ( |
return &Apache::lonlocal::texthash ( |
priv => 'Private key', |
priv => 'Private key', |
Line 8582 sub captcha_phrases {
|
Line 9376 sub captcha_phrases {
|
); |
); |
} |
} |
|
|
|
sub devalidate_remote_domconfs { |
|
my ($dom) = @_; |
|
my $primary_id = &Apache::lonnet::domain($dom,'primary'); |
|
my $intdom = &Apache::lonnet::internet_dom($primary_id); |
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
|
my %thismachine; |
|
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
|
if (keys(%servers) > 1) { |
|
foreach my $server (keys(%servers)) { |
|
next if ($thismachine{$server}); |
|
&Apache::lonnet::remote_devalidate_cache($server,'domainconfig',$dom); |
|
} |
|
} |
|
return; |
|
} |
|
|
1; |
1; |