|
version 1.138.2.6, 2010/12/30 18:53:08
|
version 1.178, 2012/12/18 15:20:50
|
|
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 (either quotas |
number of rows displayed on the page, and $action is the context (quotas, |
| or requestcourses). |
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 |
| about default quota sizes for portfolio spaces for the different types of |
about default quota sizes for portfolio spaces for the different types of |
|
Line 140 autolimit
|
Line 140 autolimit
|
| |
|
| =over |
=over |
| |
|
| - course requests will be processed autoatically up to a limit of |
- course requests will be processed automatically up to a limit of |
| N requests for the course type for the particular requestor. |
N requests for the course type for the particular requestor. |
| If N is undefined, there is no limit to the number of course requests |
If N is undefined, there is no limit to the number of course requests |
| which a course owner may submit and have processed automatically. |
which a course owner may submit and have processed automatically. |
|
Line 171 use Locale::Language;
|
Line 171 use Locale::Language;
|
| use DateTime::TimeZone; |
use DateTime::TimeZone; |
| use DateTime::Locale; |
use DateTime::Locale; |
| |
|
| |
my $registered_cleanup; |
| |
my $modified_urls; |
| |
|
| sub handler { |
sub handler { |
| my $r=shift; |
my $r=shift; |
| if ($r->header_only) { |
if ($r->header_only) { |
|
Line 190 sub handler {
|
Line 193 sub handler {
|
| "/adm/domainprefs:mau:0:0:Cannot modify domain settings"; |
"/adm/domainprefs:mau:0:0:Cannot modify domain settings"; |
| return HTTP_NOT_ACCEPTABLE; |
return HTTP_NOT_ACCEPTABLE; |
| } |
} |
| |
|
| |
$registered_cleanup=0; |
| |
@{$modified_urls}=(); |
| |
|
| &Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
| &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
| ['phase','actions']); |
['phase','actions']); |
|
Line 197 sub handler {
|
Line 204 sub handler {
|
| if ( exists($env{'form.phase'}) ) { |
if ( exists($env{'form.phase'}) ) { |
| $phase = $env{'form.phase'}; |
$phase = $env{'form.phase'}; |
| } |
} |
| |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
| my %domconfig = |
my %domconfig = |
| &Apache::lonnet::get_dom('configuration',['login','rolecolors', |
&Apache::lonnet::get_dom('configuration',['login','rolecolors', |
| 'quotas','autoenroll','autoupdate','autocreate', |
'quotas','autoenroll','autoupdate','autocreate', |
| 'directorysrch','usercreation','usermodification', |
'directorysrch','usercreation','usermodification', |
| 'contacts','defaults','scantron','coursecategories', |
'contacts','defaults','scantron','coursecategories', |
| 'serverstatuses','requestcourses','coursedefaults', |
'serverstatuses','requestcourses','helpsettings', |
| 'usersessions'],$dom); |
'coursedefaults','usersessions','loadbalancing', |
| |
'requestauthor'],$dom); |
| my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
| 'autoupdate','autocreate','directorysrch','contacts', |
'autoupdate','autocreate','directorysrch','contacts', |
| 'usercreation','usermodification','scantron', |
'usercreation','usermodification','scantron', |
| 'requestcourses','coursecategories','serverstatuses', |
'requestcourses','requestauthor','coursecategories', |
| |
'serverstatuses','helpsettings', |
| 'coursedefaults','usersessions'); |
'coursedefaults','usersessions'); |
| |
my %existing; |
| |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
| |
%existing = %{$domconfig{'loadbalancing'}}; |
| |
} |
| |
if ((keys(%servers) > 1) || (keys(%existing) > 0)) { |
| |
push(@prefs_order,'loadbalancing'); |
| |
} |
| my %prefs = ( |
my %prefs = ( |
| 'rolecolors' => |
'rolecolors' => |
| { text => 'Default color schemes', |
{ text => 'Default color schemes', |
|
Line 225 sub handler {
|
Line 242 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 236 sub handler {
|
Line 254 sub handler {
|
| col2 => 'Value'}], |
col2 => 'Value'}], |
| }, |
}, |
| 'quotas' => |
'quotas' => |
| { text => 'User blogs, personal information pages, portfolios', |
{ text => 'Blogs, personal web pages, webDAV, portfolios', |
| help => 'Domain_Configuration_Quotas', |
help => 'Domain_Configuration_Quotas', |
| header => [{col1 => 'User affiliation', |
header => [{col1 => 'User affiliation', |
| col2 => 'Available tools', |
col2 => 'Available tools', |
|
Line 312 sub handler {
|
Line 330 sub handler {
|
| {col1 => 'Setting', |
{col1 => 'Setting', |
| col2 => 'Value'}], |
col2 => 'Value'}], |
| }, |
}, |
| |
'requestauthor' => |
| |
{text => 'Request authoring space', |
| |
help => 'Domain_Configuration_Request_Author', |
| |
header => [{col1 => 'User affiliation', |
| |
col2 => 'Availability/Processing of requests',}, |
| |
{col1 => 'Setting', |
| |
col2 => 'Value'}], |
| |
}, |
| 'coursecategories' => |
'coursecategories' => |
| { text => 'Cataloging of courses/communities', |
{ text => 'Cataloging of courses/communities', |
| help => 'Domain_Configuration_Cataloging_Courses', |
help => 'Domain_Configuration_Cataloging_Courses', |
|
Line 332 sub handler {
|
Line 358 sub handler {
|
| 'helpsettings' => |
'helpsettings' => |
| {text => 'Help page settings', |
{text => 'Help page settings', |
| help => 'Domain_Configuration_Help_Settings', |
help => 'Domain_Configuration_Help_Settings', |
| header => [{col1 => 'Authenticated Help Settings', |
header => [{col1 => 'Help Settings (logged-in users)', |
| col2 => ''}, |
col2 => 'Value'}], |
| {col1 => 'Unauthenticated Help Settings', |
|
| col2 => ''}], |
|
| }, |
}, |
| 'coursedefaults' => |
'coursedefaults' => |
| {text => 'Course/Community defaults', |
{text => 'Course/Community defaults', |
| help => 'Domain_Configuration_Course_Defaults', |
help => 'Domain_Configuration_Course_Defaults', |
| header => [{col1 => 'Defaults which can be overridden for each course by a DC', |
header => [{col1 => 'Defaults which can be overridden in each course by a CC', |
| col2 => 'Value',}], |
col2 => 'Value',}, |
| |
{col1 => 'Defaults which can be overridden for each course by a DC', |
| |
col2 => 'Value',},], |
| }, |
}, |
| 'privacy' => |
'privacy' => |
| {text => 'User Privacy', |
{text => 'User Privacy', |
|
Line 349 sub handler {
|
Line 375 sub handler {
|
| header => [{col1 => 'Setting', |
header => [{col1 => 'Setting', |
| col2 => 'Value',}], |
col2 => 'Value',}], |
| }, |
}, |
| 'usersessions' => |
'usersessions' => |
| {text => 'User session hosting', |
{text => 'User session hosting/offloading', |
| help => 'Domain_Configuration_User_Sessions', |
help => 'Domain_Configuration_User_Sessions', |
| header => [{col1 => 'Hosting of users from other domains', |
header => [{col1 => 'Domain server', |
| |
col2 => 'Servers to offload sessions to when busy'}, |
| |
{col1 => 'Hosting of users from other domains', |
| col2 => 'Rules'}, |
col2 => 'Rules'}, |
| {col1 => "Hosting domain's own users elsewhere", |
{col1 => "Hosting domain's own users elsewhere", |
| col2 => 'Rules'}], |
col2 => 'Rules'}], |
| }, |
}, |
| |
'loadbalancing' => |
| |
{text => 'Dedicated Load Balancer', |
| |
help => 'Domain_Configuration_Load_Balancing', |
| |
header => [{col1 => 'Balancers', |
| |
col2 => 'Default destinations', |
| |
col3 => 'User affliation', |
| |
col4 => 'Overrides'}, |
| |
], |
| |
}, |
| ); |
); |
| my %servers = &dom_servers($dom); |
|
| if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
| $prefs{'login'} = { text => 'Log-in page options', |
$prefs{'login'} = { text => 'Log-in page options', |
| help => 'Domain_Configuration_Login_Page', |
help => 'Domain_Configuration_Login_Page', |
| 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); |
&Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles); |
| } elsif ($phase eq 'display') { |
} elsif ($phase eq 'display') { |
| &Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname); |
my $js = &recaptcha_js(); |
| |
if ((keys(%servers) > 1) || (keys(%existing) > 0)) { |
| |
my ($othertitle,$usertypes,$types) = |
| |
&Apache::loncommon::sorted_inst_types($dom); |
| |
$js .= &lonbalance_targets_js($dom,$types,\%servers, |
| |
$domconfig{'loadbalancing'}). |
| |
&new_spares_js(). |
| |
&common_domprefs_js(). |
| |
&Apache::loncommon::javascript_array_indexof(); |
| |
} |
| |
&Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js); |
| } else { |
} else { |
| if (keys(%domconfig) == 0) { |
if (keys(%domconfig) == 0) { |
| my $primarylibserv = &Apache::lonnet::domain($dom,'primary'); |
my $primarylibserv = &Apache::lonnet::domain($dom,'primary'); |
|
Line 412 sub handler {
|
Line 464 sub handler {
|
| } |
} |
| } |
} |
| } |
} |
| |
|
| &Apache::lonconfigsettings::display_choices($r,$phase,$context,\@prefs_order,\%prefs); |
&Apache::lonconfigsettings::display_choices($r,$phase,$context,\@prefs_order,\%prefs); |
| } |
} |
| return OK; |
return OK; |
|
Line 455 sub process_changes {
|
Line 508 sub process_changes {
|
| $output = &modify_serverstatuses($dom,%domconfig); |
$output = &modify_serverstatuses($dom,%domconfig); |
| } elsif ($action eq 'requestcourses') { |
} elsif ($action eq 'requestcourses') { |
| $output = &modify_quotas($dom,$action,%domconfig); |
$output = &modify_quotas($dom,$action,%domconfig); |
| |
} elsif ($action eq 'requestauthor') { |
| |
$output = &modify_quotas($dom,$action,%domconfig); |
| |
} elsif ($action eq 'helpsettings') { |
| |
$output = &modify_helpsettings($r,$dom,$confname,%domconfig); |
| } elsif ($action eq 'coursedefaults') { |
} elsif ($action eq 'coursedefaults') { |
| $output = &modify_coursedefaults($dom,%domconfig); |
$output = &modify_coursedefaults($dom,%domconfig); |
| } elsif ($action eq 'usersessions') { |
} elsif ($action eq 'usersessions') { |
| $output = &modify_usersessions($dom,%domconfig); |
$output = &modify_usersessions($dom,%domconfig); |
| |
} elsif ($action eq 'loadbalancing') { |
| |
$output = &modify_loadbalancing($dom,%domconfig); |
| } |
} |
| return $output; |
return $output; |
| } |
} |
|
Line 467 sub print_config_box {
|
Line 526 sub print_config_box {
|
| my ($r,$dom,$confname,$phase,$action,$item,$settings) = @_; |
my ($r,$dom,$confname,$phase,$action,$item,$settings) = @_; |
| my $rowtotal = 0; |
my $rowtotal = 0; |
| my $output; |
my $output; |
| |
|
| if ($action eq 'coursecategories') { |
if ($action eq 'coursecategories') { |
| $output = &coursecategories_javascript($settings); |
$output = &coursecategories_javascript($settings); |
| } |
} |
|
Line 484 sub print_config_box {
|
Line 544 sub print_config_box {
|
| } |
} |
| if ($numheaders > 1) { |
if ($numheaders > 1) { |
| my $colspan = ''; |
my $colspan = ''; |
| if (($action eq 'rolecolors') || ($action eq 'coursecategories') || ($action eq 'helpsettings')) { |
my $rightcolspan = ''; |
| |
if (($action eq 'rolecolors') || ($action eq 'coursecategories') || |
| |
(($action eq 'login') && ($numheaders < 3))) { |
| $colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
| } |
} |
| |
if ($action eq 'usersessions') { |
| |
$rightcolspan = ' colspan="3"'; |
| |
} |
| $output .= ' |
$output .= ' |
| <tr> |
<tr> |
| <td> |
<td> |
| <table class="LC_nested"> |
<table class="LC_nested"> |
| <tr class="LC_info_row"> |
<tr class="LC_info_row"> |
| <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[0]->{'col1'}).'</td> |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[0]->{'col1'}).'</td> |
| <td class="LC_right_item">'.&mt($item->{'header'}->[0]->{'col2'}).'</td> |
<td class="LC_right_item"'.$rightcolspan.'>'.&mt($item->{'header'}->[0]->{'col2'}).'</td> |
| </tr>'; |
</tr>'; |
| $rowtotal ++; |
$rowtotal ++; |
| if ($action eq 'autoupdate') { |
if ($action eq 'autoupdate') { |
|
Line 505 sub print_config_box {
|
Line 570 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 'helpsettings') { |
} elsif ($action eq 'requestauthor') { |
| $output .= &print_helpsettings('top',$dom,$confname,$settings,\$rowtotal); |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
| } 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') { |
| $output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal); |
$output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal); |
| |
} elsif ($action eq 'coursedefaults') { |
| |
$output .= &print_coursedefaults('top',$dom,$settings,\$rowtotal); |
| } |
} |
| $output .= ' |
$output .= ' |
| </table> |
</table> |
|
Line 571 sub print_config_box {
|
Line 642 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_courserequestmail($dom,$settings,\$rowtotal); |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
| } elsif ($action eq 'helpsettings') { |
} elsif ($action eq 'requestauthor') { |
| $output .= &print_helpsettings('bottom',$dom,$confname,$settings,\$rowtotal); |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
| } elsif ($action eq 'usersessions') { |
} elsif ($action eq 'usersessions') { |
| $output .= &print_usersessions('bottom',$dom,$settings,\$rowtotal); |
$output .= &print_usersessions('middle',$dom,$settings,\$rowtotal).' |
| |
</table> |
| |
</td> |
| |
</tr> |
| |
<tr> |
| |
<td> |
| |
<table class="LC_nested"> |
| |
<tr class="LC_info_row"> |
| |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
| |
<td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> </tr>'. |
| |
&print_usersessions('bottom',$dom,$settings,\$rowtotal); |
| |
$rowtotal ++; |
| |
} elsif ($action eq 'coursedefaults') { |
| |
$output .= &print_coursedefaults('bottom',$dom,$settings,\$rowtotal); |
| } elsif ($action eq 'rolecolors') { |
} elsif ($action eq 'rolecolors') { |
| $output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).' |
$output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).' |
| </table> |
</table> |
|
Line 636 sub print_config_box {
|
Line 735 sub print_config_box {
|
| } |
} |
| $output .= '</td>'; |
$output .= '</td>'; |
| if ($item->{'header'}->[0]->{'col3'}) { |
if ($item->{'header'}->[0]->{'col3'}) { |
| $output .= '<td class="LC_right_item" valign="top">'. |
if (defined($item->{'header'}->[0]->{'col4'})) { |
| &mt($item->{'header'}->[0]->{'col3'}); |
$output .= '<td class="LC_left_item" valign="top">'. |
| |
&mt($item->{'header'}->[0]->{'col3'}); |
| |
} else { |
| |
$output .= '<td class="LC_right_item" valign="top">'. |
| |
&mt($item->{'header'}->[0]->{'col3'}); |
| |
} |
| if ($action eq 'serverstatuses') { |
if ($action eq 'serverstatuses') { |
| $output .= '<br />(<tt>'.&mt('IP1,IP2 etc.').'</tt>)'; |
$output .= '<br />(<tt>'.&mt('IP1,IP2 etc.').'</tt>)'; |
| } |
} |
| $output .= '</td>'; |
$output .= '</td>'; |
| } |
} |
| |
if ($item->{'header'}->[0]->{'col4'}) { |
| |
$output .= '<td class="LC_right_item" valign="top">'. |
| |
&mt($item->{'header'}->[0]->{'col4'}); |
| |
} |
| $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 664 sub print_config_box {
|
Line 769 sub print_config_box {
|
| $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal); |
$output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal); |
| } elsif ($action eq 'serverstatuses') { |
} elsif ($action eq 'serverstatuses') { |
| $output .= &print_serverstatuses($dom,$settings,\$rowtotal); |
$output .= &print_serverstatuses($dom,$settings,\$rowtotal); |
| } elsif ($action eq 'coursedefaults') { |
} elsif ($action eq 'helpsettings') { |
| $output .= &print_coursedefaults('bottom',$dom,$settings,\$rowtotal); |
$output .= &print_helpsettings($dom,$confname,$settings,\$rowtotal); |
| |
} elsif ($action eq 'loadbalancing') { |
| |
$output .= &print_loadbalancing($dom,$settings,\$rowtotal); |
| } |
} |
| } |
} |
| $output .= ' |
$output .= ' |
|
Line 677 sub print_config_box {
|
Line 784 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 = &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"'; |
| $datatable .= '<tr'.$css_class.'><td>'.$choice.'</td>'. |
$datatable .= '<tr'.$css_class.'><td>'.$choice.'</td>'. |
|
Line 708 sub print_login {
|
Line 815 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 748 sub print_login {
|
Line 855 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', |
'adminmail' => 'off', |
| 'adminmail' => 'off', |
'newuser' => 'off', |
| 'newuser' => 'off', |
); |
| ); |
my @toggles = ('coursecatalog','adminmail','newuser'); |
| my @toggles = ('coursecatalog','adminmail','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) { |
| } else { |
if ($settings->{$item} ne '') { |
| if ($designhash{$dom.'.login.font'} ne '') { |
$designs{'logintext'}{$item} = $settings->{$item}; |
| $designs{'font'} = $designhash{$dom.'.login.font'}; |
$is_custom{$item} = 1; |
| $is_custom{'font'} = 1; |
} |
| } |
} |
| foreach my $item (@images) { |
if ($settings->{'font'} ne '') { |
| if ($designhash{$dom.'.login.'.$item} ne '') { |
$designs{'font'} = $settings->{'font'}; |
| $designs{$item} = $designhash{$dom.'.login.'.$item}; |
$is_custom{'font'} = 1; |
| $is_custom{$item} = 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; |
| |
} |
| } |
} |
| } |
} |
| foreach my $item (@bgs) { |
my %alt_text = &Apache::lonlocal::texthash ( img => 'Log-in banner', |
| if ($designhash{$dom.'.login.'.$item} ne '') { |
logo => 'Institution Logo', |
| $designs{'bgs'}{$item} = $designhash{$dom.'.login.'.$item}; |
domlogo => 'Domain Logo', |
| $is_custom{$item} = 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 ++; |
| |
} |
| |
$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>'; |
| |
} elsif ($caller eq 'help') { |
| |
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 $lang ('nolang',sort(@currlangs)) { |
| |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
| |
$datatable .= '<tr'.$css_class.'>'; |
| |
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; |
|
| my ($css_class,$datatable); |
|
| 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 993 sub print_rolecolors {
|
Line 1188 sub print_rolecolors {
|
| 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) = @_; |
| |
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
| my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
| my $datatable = '<tr'.$css_class.'>'. |
my $datatable = '<tr'.$css_class.'>'. |
| '<td>'.$choices->{'font'}.'</td>'; |
'<td>'.$choices->{'font'}.'</td>'; |
|
Line 1001 sub display_color_options {
|
Line 1197 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 1016 sub display_color_options {
|
Line 1211 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 1070 sub display_color_options {
|
Line 1265 sub display_color_options {
|
| $showfile = $imgfile; |
$showfile = $imgfile; |
| my $imgdir = $1; |
my $imgdir = $1; |
| my $filename = $2; |
my $filename = $2; |
| if (-e "/home/httpd/html/$imgdir/tn-".$filename) { |
if (-e "$londocroot/$imgdir/tn-".$filename) { |
| $showfile = "/$imgdir/tn-".$filename; |
$showfile = "/$imgdir/tn-".$filename; |
| } else { |
} else { |
| my $input = "/home/httpd/html".$imgfile; |
my $input = $londocroot.$imgfile; |
| my $output = '/home/httpd/html/'.$imgdir.'/tn-'.$filename; |
my $output = "$londocroot/$imgdir/tn-".$filename; |
| if (!-e $output) { |
if (!-e $output) { |
| my ($width,$height) = &thumb_dimensions(); |
my ($width,$height) = &thumb_dimensions(); |
| my ($fullwidth,$fullheight) = &check_dimensions($input); |
my ($fullwidth,$fullheight) = &check_dimensions($input); |
|
Line 1082 sub display_color_options {
|
Line 1277 sub display_color_options {
|
| if ($fullwidth > $width && $fullheight > $height) { |
if ($fullwidth > $width && $fullheight > $height) { |
| my $size = $width.'x'.$height; |
my $size = $width.'x'.$height; |
| system("convert -sample $size $input $output"); |
system("convert -sample $size $input $output"); |
| $showfile = '/'.$imgdir.'/tn-'.$filename; |
$showfile = "/$imgdir/tn-".$filename; |
| } |
} |
| } |
} |
| } |
} |
|
Line 1149 sub display_color_options {
|
Line 1344 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}); |
# my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'bgs'}{$item}); |
| $datatable .= '<td align="center">'.$link; |
$datatable .= '<td align="center">'; |
| |
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 1177 sub display_color_options {
|
Line 1375 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">'."\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 1310 sub print_quotas {
|
Line 1508 sub print_quotas {
|
| @options =('norequest','approval','validate','autolimit'); |
@options =('norequest','approval','validate','autolimit'); |
| %validations = &Apache::lonnet::auto_courserequest_checks($dom); |
%validations = &Apache::lonnet::auto_courserequest_checks($dom); |
| %titles = &courserequest_titles(); |
%titles = &courserequest_titles(); |
| |
} elsif ($context eq 'requestauthor') { |
| |
@usertools = ('author'); |
| |
@options = ('norequest','approval','automatic'); |
| |
%titles = &authorrequest_titles(); |
| } else { |
} else { |
| @usertools = ('aboutme','blog','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; |
| unless ($context eq 'requestcourses') { |
unless (($context eq 'requestcourses') || |
| |
($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}; |
|
Line 1387 sub print_quotas {
|
Line 1590 sub print_quotas {
|
| $cell{$item} .= $titles{'unlimited'}; |
$cell{$item} .= $titles{'unlimited'}; |
| } |
} |
| } |
} |
| |
} elsif ($context eq 'requestauthor') { |
| |
my $curroption; |
| |
if (ref($settings) eq 'HASH') { |
| |
$curroption = $settings->{$type}; |
| |
} |
| |
if (!$curroption) { |
| |
$curroption = 'norequest'; |
| |
} |
| |
foreach my $option (@options) { |
| |
my $val = $option; |
| |
if ($option eq 'norequest') { |
| |
$val = 0; |
| |
} |
| |
my $checked = ''; |
| |
if ($option eq $curroption) { |
| |
$checked = ' checked="checked"'; |
| |
} |
| |
$datatable .= '<span class="LC_nobreak"><label>'. |
| |
'<input type="radio" name="authorreq_'.$type. |
| |
'" value="'.$val.'"'.$checked.' />'. |
| |
$titles{$option}.'</label></span> '; |
| |
} |
| } else { |
} else { |
| my $checked = 'checked="checked" '; |
my $checked = 'checked="checked" '; |
| if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
|
Line 1412 sub print_quotas {
|
Line 1637 sub print_quotas {
|
| $datatable .= '</tr></table>'; |
$datatable .= '</tr></table>'; |
| } |
} |
| $datatable .= '</td>'; |
$datatable .= '</td>'; |
| unless ($context eq 'requestcourses') { |
unless (($context eq 'requestcourses') || |
| |
($context eq 'requestauthor')) { |
| $datatable .= |
$datatable .= |
| '<td class="LC_right_item"><span class="LC_nobreak">'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
| '<input type="text" name="quota_'.$type. |
'<input type="text" name="quota_'.$type. |
|
Line 1423 sub print_quotas {
|
Line 1649 sub print_quotas {
|
| } |
} |
| } |
} |
| } |
} |
| unless ($context eq 'requestcourses') { |
unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) { |
| $defaultquota = '20'; |
$defaultquota = '20'; |
| if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
| if (ref($settings->{'defaultquota'}) eq 'HASH') { |
if (ref($settings->{'defaultquota'}) eq 'HASH') { |
|
Line 1493 sub print_quotas {
|
Line 1719 sub print_quotas {
|
| $defcell{$item} .= $titles{'unlimited'}; |
$defcell{$item} .= $titles{'unlimited'}; |
| } |
} |
| } |
} |
| |
} elsif ($context eq 'requestauthor') { |
| |
my $curroption; |
| |
if (ref($settings) eq 'HASH') { |
| |
$curroption = $settings->{'default'}; |
| |
} |
| |
if (!$curroption) { |
| |
$curroption = 'norequest'; |
| |
} |
| |
foreach my $option (@options) { |
| |
my $val = $option; |
| |
if ($option eq 'norequest') { |
| |
$val = 0; |
| |
} |
| |
my $checked = ''; |
| |
if ($option eq $curroption) { |
| |
$checked = ' checked="checked"'; |
| |
} |
| |
$datatable .= '<span class="LC_nobreak"><label>'. |
| |
'<input type="radio" name="authorreq_default"'. |
| |
' value="'.$val.'"'.$checked.' />'. |
| |
$titles{$option}.'</label></span> '; |
| |
} |
| } else { |
} else { |
| my $checked = 'checked="checked" '; |
my $checked = 'checked="checked" '; |
| if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
|
Line 1518 sub print_quotas {
|
Line 1766 sub print_quotas {
|
| $datatable .= '</tr></table>'; |
$datatable .= '</tr></table>'; |
| } |
} |
| $datatable .= '</td>'; |
$datatable .= '</td>'; |
| unless ($context eq 'requestcourses') { |
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">'. |
| '<input type="text" name="defaultquota" value="'. |
'<input type="text" name="defaultquota" value="'. |
| $defaultquota.'" size="5" /> Mb</span></td>'; |
$defaultquota.'" size="5" /> Mb</span></td>'; |
|
Line 1596 sub print_quotas {
|
Line 1844 sub print_quotas {
|
| $advcell{$item} .= $titles{'unlimited'}; |
$advcell{$item} .= $titles{'unlimited'}; |
| } |
} |
| } |
} |
| |
} elsif ($context eq 'requestauthor') { |
| |
my $curroption; |
| |
if (ref($settings) eq 'HASH') { |
| |
$curroption = $settings->{'_LC_adv'}; |
| |
} |
| |
my $checked = ''; |
| |
if ($curroption eq '') { |
| |
$checked = ' checked="checked"'; |
| |
} |
| |
$datatable .= '<span class="LC_nobreak"><label>'. |
| |
'<input type="radio" name="authorreq__LC_adv"'. |
| |
' value=""'.$checked.' />'. |
| |
&mt('No override set').'</label></span> '; |
| |
foreach my $option (@options) { |
| |
my $val = $option; |
| |
if ($option eq 'norequest') { |
| |
$val = 0; |
| |
} |
| |
my $checked = ''; |
| |
if ($val eq $curroption) { |
| |
$checked = ' checked="checked"'; |
| |
} |
| |
$datatable .= '<span class="LC_nobreak"><label>'. |
| |
'<input type="radio" name="authorreq__LC_adv"'. |
| |
' value="'.$val.'"'.$checked.' />'. |
| |
$titles{$option}.'</label></span> '; |
| |
} |
| } else { |
} else { |
| my $checked = 'checked="checked" '; |
my $checked = 'checked="checked" '; |
| if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
|
Line 1625 sub print_quotas {
|
Line 1900 sub print_quotas {
|
| return $datatable; |
return $datatable; |
| } |
} |
| |
|
| sub print_courserequestmail { |
sub print_requestmail { |
| my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$action,$settings,$rowtotal) = @_; |
| my ($now,$datatable,%dompersonnel,@domcoord,@currapproval,$rows); |
my ($now,$datatable,%dompersonnel,@domcoord,@currapproval,$rows); |
| $now = time; |
$now = time; |
| $rows = 0; |
$rows = 0; |
|
Line 1657 sub print_courserequestmail {
|
Line 1932 sub print_courserequestmail {
|
| my $numinrow = 4; |
my $numinrow = 4; |
| my $numdc = @domcoord; |
my $numdc = @domcoord; |
| my $css_class = 'class="LC_odd_row"'; |
my $css_class = 'class="LC_odd_row"'; |
| $datatable = '<tr'.$css_class.'>'. |
my $text; |
| ' <td>'.&mt('Receive notification of course requests requiring approval.'). |
if ($action eq 'requestcourses') { |
| ' </td>'. |
$text = &mt('Receive notification of course requests requiring approval'); |
| |
} else { |
| |
$text = &mt('Receive notification of authoring space requests requiring approval') |
| |
} |
| |
$datatable = '<tr '.$css_class.'>'. |
| |
' <td>'.$text.'</td>'. |
| ' <td class="LC_left_item">'; |
' <td class="LC_left_item">'; |
| if (@domcoord > 0) { |
if (@domcoord > 0) { |
| $datatable .= '<table>'; |
$datatable .= '<table>'; |
|
Line 1691 sub print_courserequestmail {
|
Line 1971 sub print_courserequestmail {
|
| $datatable .= '<span class="LC_nobreak"><label>'. |
$datatable .= '<span class="LC_nobreak"><label>'. |
| '<input type="checkbox" name="reqapprovalnotify" '. |
'<input type="checkbox" name="reqapprovalnotify" '. |
| 'value="'.$domcoord[$i].'"'.$check.'/>'. |
'value="'.$domcoord[$i].'"'.$check.'/>'. |
| $fullname.'</label></span></td>'; |
$fullname.' ('.$uname.':'.$udom.')</label></span></td>'; |
| } |
} |
| $datatable .= '</tr></table>'; |
$datatable .= '</tr></table>'; |
| } else { |
} else { |
|
Line 1879 sub print_autocreate {
|
Line 2159 sub print_autocreate {
|
| '<input type="radio" name="autocreate_xml"'. |
'<input type="radio" name="autocreate_xml"'. |
| $createon{'xml'}.' value="1" />'.&mt('Yes').'</label> '. |
$createon{'xml'}.' value="1" />'.&mt('Yes').'</label> '. |
| '<label><input type="radio" name="autocreate_xml"'. |
'<label><input type="radio" name="autocreate_xml"'. |
| $createoff{'xml'}.' value="0" />'.&mt('No').'</label></span>'; |
$createoff{'xml'}.' value="0" />'.&mt('No').'</label></span>'. |
| |
'</td></tr><tr>'. |
| |
'<td>'.&mt('Create pending requests for official courses (if validated)').'</td>'. |
| |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
| |
'<input type="radio" name="autocreate_req"'. |
| |
$createon{'req'}.' value="1" />'.&mt('Yes').'</label> '. |
| |
'<label><input type="radio" name="autocreate_req"'. |
| |
$createoff{'req'}.' value="0" />'.&mt('No').'</label></span>'; |
| my ($numdc,$dctable) = &active_dc_picker($dom,$curr_dc); |
my ($numdc,$dctable) = &active_dc_picker($dom,$curr_dc); |
| if ($numdc > 1) { |
if ($numdc > 1) { |
| $datatable .= '</td><tr><td>'. |
$datatable .= '</td></tr><tr class="LC_odd_row"><td>'. |
| &mt('XML files 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>'; |
| '<tr class="LC_odd_row">'; |
|
| $$rowtotal ++ ; |
$$rowtotal ++ ; |
| } else { |
} else { |
| $datatable .= '</td></tr><tr>'; |
$datatable .= $dctable.'</td></tr>'; |
| } |
} |
| $datatable .= '<td>'.&mt('Create pending requests for official courses (if validated)').'</td>'. |
|
| '<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
|
| '<input type="radio" name="autocreate_req"'. |
|
| $createon{'req'}.' value="1" />'.&mt('Yes').'</label> '. |
|
| '<label><input type="radio" name="autocreate_req"'. |
|
| $createoff{'req'}.' value="0" />'.&mt('No').'</label></span></td>'. |
|
| '</tr>'; |
|
| return $datatable; |
return $datatable; |
| } |
} |
| |
|
|
Line 2098 sub print_contacts {
|
Line 2377 sub print_contacts {
|
| } |
} |
| |
|
| sub print_helpsettings { |
sub print_helpsettings { |
| |
my ($dom,$confname,$settings,$rowtotal) = @_; |
| |
my ($datatable,$itemcount); |
| |
$itemcount = 1; |
| |
my (%choices,%defaultchecked,@toggles); |
| |
$choices{'submitbugs'} = &mt('Display link to: [_1]?', |
| |
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
| |
&mt('LON-CAPA bug tracker'),600,500)); |
| |
%defaultchecked = ('submitbugs' => 'on'); |
| |
@toggles = ('submitbugs',); |
| |
|
| my ($position,$dom,$confname,$settings,$rowtotal) = @_; |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
| my ($css_class,$datatable); |
\%choices,$itemcount); |
| |
return $datatable; |
| my $switchserver = &check_switchserver($dom,$confname); |
|
| |
|
| my $itemcount = 1; |
|
| |
|
| if ($position eq 'top') { |
|
| |
|
| my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles); |
|
| |
|
| %choices = |
|
| &Apache::lonlocal::texthash ( |
|
| submitbugs => 'Display "Submit a bug" link?', |
|
| ); |
|
| |
|
| %defaultchecked = ('submitbugs' => 'on'); |
|
| |
|
| @toggles = ('submitbugs',); |
|
| |
|
| 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} = ' '; |
|
| } |
|
| } |
|
| |
|
| if (ref($settings) eq 'HASH') { |
|
| foreach my $item (@toggles) { |
|
| if ($settings->{$item} eq '1') { |
|
| $checkedon{$item} = ' checked="checked" '; |
|
| $checkedoff{$item} = ' '; |
|
| } elsif ($settings->{$item} eq '0') { |
|
| $checkedoff{$item} = ' checked="checked" '; |
|
| $checkedon{$item} = ' '; |
|
| } |
|
| } |
|
| } |
|
| |
|
| foreach my $item (@toggles) { |
|
| $css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
| $datatable .= |
|
| '<tr'.$css_class.'> |
|
| <td><span class="LC_nobreak">'.$choices{$item}.'</span></td> |
|
| <td><span class="LC_nobreak"> </span></td> |
|
| <td class="LC_right_item"><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 ++; |
|
| } |
|
| |
|
| } else { |
|
| |
|
| $css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
| |
|
| $datatable .= '<tr'.$css_class.'>'; |
|
| |
|
| if (ref($settings) eq 'HASH') { |
|
| if ($settings->{'loginhelpurl'} ne '') { |
|
| my($directory, $filename) = $settings->{'loginhelpurl'} =~ m/(.*\/)(.*)$/; |
|
| $datatable .= '<td width="33%"><span class="LC_left_item"><label><a href="'.$settings->{'loginhelpurl'}.'" target="_blank">'.&mt('Custom Login Page Help File In Use').'</a></label></span></td>'; |
|
| $datatable .= '<td width="33%"><span class="LC_right_item"><label><input type="checkbox" name="loginhelpurl_del" value="1" />'.&mt('Delete?').'</label></span></td>' |
|
| } else { |
|
| $datatable .= '<td width="33%"><span class="LC_left_item"><label>'.&mt('Default Login Page Help File In Use').'</label></span></td>'; |
|
| $datatable .= '<td width="33%"><span class="LC_right_item"> </span></td>'; |
|
| } |
|
| } else { |
|
| $datatable .= '<td><span class="LC_left_item"> </span></td>'; |
|
| $datatable .= '<td><span class="LC_right_item"> </span></td>'; |
|
| } |
|
| |
|
| $datatable .= '<td width="33%"><span class="LC_right_item">'; |
|
| if ($switchserver) { |
|
| $datatable .= &mt('Upload to library server: [_1]',$switchserver); |
|
| } else { |
|
| $datatable .= &mt('Upload Custom Login Page Help File:'); |
|
| $datatable .='<input type="file" name="loginhelpurl" />'; |
|
| } |
|
| $datatable .= '</span></td></tr>'; |
|
| |
|
| } |
|
| |
|
| return $datatable; |
|
| |
|
| } |
} |
| |
|
| |
|
| sub radiobutton_prefs { |
sub radiobutton_prefs { |
| my ($settings,$toggles,$defaultchecked,$choices,$itemcount) = @_; |
my ($settings,$toggles,$defaultchecked,$choices,$itemcount) = @_; |
| return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && |
return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && |
|
Line 2281 sub print_usersessions {
|
Line 2482 sub print_usersessions {
|
| my ($css_class,$datatable,%checked,%choices); |
my ($css_class,$datatable,%checked,%choices); |
| my (%by_ip,%by_location,@intdoms); |
my (%by_ip,%by_location,@intdoms); |
| &build_location_hashes(\@intdoms,\%by_ip,\%by_location); |
&build_location_hashes(\@intdoms,\%by_ip,\%by_location); |
| if (keys(%by_location) == 0) { |
|
| if ($position eq 'top') { |
my @alldoms = &Apache::lonnet::all_domains(); |
| $datatable .= '<tr'.$css_class.'><td colspan="2">'. |
my %serverhomes = %Apache::lonnet::serverhomeIDs; |
| &mt('Nothing to set here, as the cluster to which this domain belongs only contains this institution.'); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
| } |
my %altids = &id_for_thisdom(%servers); |
| } |
|
| my %lt = &usersession_titles(); |
|
| my $itemcount = 1; |
my $itemcount = 1; |
| my $numinrow = 5; |
|
| my $prefix; |
|
| my @types; |
|
| if ($position eq 'top') { |
if ($position eq 'top') { |
| $prefix = 'hosted'; |
if (keys(%serverhomes) > 1) { |
| @types = ('excludedomain','includedomain'); |
my %spareid = ¤t_offloads_to($dom,$settings,\%servers); |
| |
$datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$rowtotal); |
| |
} else { |
| |
$datatable .= '<tr'.$css_class.'><td colspan="2">'. |
| |
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.'); |
| |
} |
| } else { |
} else { |
| $prefix = 'remote'; |
if (keys(%by_location) == 0) { |
| @types = ('version','excludedomain','includedomain'); |
$datatable .= '<tr'.$css_class.'><td colspan="2">'. |
| } |
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one institution.'); |
| my (%current,%checkedon,%checkedoff); |
} else { |
| my @lcversions = &Apache::lonnet::all_loncaparevs(); |
my %lt = &usersession_titles(); |
| my @locations = sort(keys(%by_location)); |
my $numinrow = 5; |
| foreach my $type (@types) { |
my $prefix; |
| $checkedon{$type} = ''; |
my @types; |
| $checkedoff{$type} = ' checked="checked"'; |
if ($position eq 'bottom') { |
| } |
$prefix = 'remote'; |
| if (ref($settings) eq 'HASH') { |
@types = ('version','excludedomain','includedomain'); |
| if (ref($settings->{$prefix}) eq 'HASH') { |
} else { |
| foreach my $key (keys(%{$settings->{$prefix}})) { |
$prefix = 'hosted'; |
| $current{$key} = $settings->{$prefix}{$key}; |
@types = ('excludedomain','includedomain'); |
| if ($key eq 'version') { |
|
| if ($current{$key} ne '') { |
|
| $checkedon{$key} = ' checked="checked"'; |
|
| $checkedoff{$key} = ''; |
|
| } |
|
| } elsif (ref($current{$key}) eq 'ARRAY') { |
|
| $checkedon{$key} = ' checked="checked"'; |
|
| $checkedoff{$key} = ''; |
|
| } |
|
| } |
} |
| } |
my (%current,%checkedon,%checkedoff); |
| } |
my @lcversions = &Apache::lonnet::all_loncaparevs(); |
| foreach my $type (@types) { |
my @locations = sort(keys(%by_location)); |
| next if ($type ne 'version' && !@locations); |
foreach my $type (@types) { |
| $css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$checkedon{$type} = ''; |
| $datatable .= '<tr'.$css_class.'> |
$checkedoff{$type} = ' checked="checked"'; |
| <td><span class="LC_nobreak">'.$lt{$type}.'</span><br /> |
} |
| <span class="LC_nobreak"> |
if (ref($settings) eq 'HASH') { |
| <label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedoff{$type}.' value="0" />'.&mt('Not in use').'</label> |
if (ref($settings->{$prefix}) eq 'HASH') { |
| <label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedon{$type}.' value="1" />'.&mt('In use').'</label></span></td><td>'; |
foreach my $key (keys(%{$settings->{$prefix}})) { |
| if ($type eq 'version') { |
$current{$key} = $settings->{$prefix}{$key}; |
| my $selector = '<select name="'.$prefix.'_version">'; |
if ($key eq 'version') { |
| foreach my $version (@lcversions) { |
if ($current{$key} ne '') { |
| my $selected = ''; |
$checkedon{$key} = ' checked="checked"'; |
| if ($current{'version'} eq $version) { |
$checkedoff{$key} = ''; |
| $selected = ' selected="selected"'; |
} |
| |
} elsif (ref($current{$key}) eq 'ARRAY') { |
| |
$checkedon{$key} = ' checked="checked"'; |
| |
$checkedoff{$key} = ''; |
| |
} |
| |
} |
| } |
} |
| $selector .= ' <option value="'.$version.'"'. |
|
| $selected.'>'.$version.'</option>'; |
|
| } |
} |
| $selector .= '</select> '; |
foreach my $type (@types) { |
| $datatable .= &mt('remote server must be version: [_1] or later',$selector); |
next if ($type ne 'version' && !@locations); |
| } else { |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
| $datatable.= '<div><input type="button" value="'.&mt('check all').'" '. |
$datatable .= '<tr'.$css_class.'> |
| 'onclick="javascript:checkAll(document.display.'.$prefix.'_'.$type.')"'. |
<td><span class="LC_nobreak">'.$lt{$type}.'</span><br /> |
| ' />'.(' 'x2). |
<span class="LC_nobreak"> |
| '<input type="button" value="'.&mt('uncheck all').'" '. |
<label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedoff{$type}.' value="0" />'.&mt('Not in use').'</label> |
| 'onclick="javascript:uncheckAll(document.display.'.$prefix.'_'.$type.')" />'. |
<label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedon{$type}.' value="1" />'.&mt('In use').'</label></span></td><td>'; |
| "\n". |
if ($type eq 'version') { |
| '</div><div><table>'; |
my $selector = '<select name="'.$prefix.'_version">'; |
| my $rem; |
foreach my $version (@lcversions) { |
| for (my $i=0; $i<@locations; $i++) { |
my $selected = ''; |
| my ($showloc,$value,$checkedtype); |
if ($current{'version'} eq $version) { |
| if (ref($by_location{$locations[$i]}) eq 'ARRAY') { |
$selected = ' selected="selected"'; |
| my $ip = $by_location{$locations[$i]}->[0]; |
} |
| if (ref($by_ip{$ip}) eq 'ARRAY') { |
$selector .= ' <option value="'.$version.'"'. |
| $value = join(':',@{$by_ip{$ip}}); |
$selected.'>'.$version.'</option>'; |
| $showloc = join(', ',@{$by_ip{$ip}}); |
} |
| if (ref($current{$type}) eq 'ARRAY') { |
$selector .= '</select> '; |
| foreach my $loc (@{$by_ip{$ip}}) { |
$datatable .= &mt('remote server must be version: [_1] or later',$selector); |
| if (grep(/^\Q$loc\E$/,@{$current{$type}})) { |
} else { |
| $checkedtype = ' checked="checked"'; |
$datatable.= '<div><input type="button" value="'.&mt('check all').'" '. |
| last; |
'onclick="javascript:checkAll(document.display.'.$prefix.'_'.$type.')"'. |
| |
' />'.(' 'x2). |
| |
'<input type="button" value="'.&mt('uncheck all').'" '. |
| |
'onclick="javascript:uncheckAll(document.display.'.$prefix.'_'.$type.')" />'. |
| |
"\n". |
| |
'</div><div><table>'; |
| |
my $rem; |
| |
for (my $i=0; $i<@locations; $i++) { |
| |
my ($showloc,$value,$checkedtype); |
| |
if (ref($by_location{$locations[$i]}) eq 'ARRAY') { |
| |
my $ip = $by_location{$locations[$i]}->[0]; |
| |
if (ref($by_ip{$ip}) eq 'ARRAY') { |
| |
$value = join(':',@{$by_ip{$ip}}); |
| |
$showloc = join(', ',@{$by_ip{$ip}}); |
| |
if (ref($current{$type}) eq 'ARRAY') { |
| |
foreach my $loc (@{$by_ip{$ip}}) { |
| |
if (grep(/^\Q$loc\E$/,@{$current{$type}})) { |
| |
$checkedtype = ' checked="checked"'; |
| |
last; |
| |
} |
| |
} |
| } |
} |
| } |
} |
| } |
} |
| |
$rem = $i%($numinrow); |
| |
if ($rem == 0) { |
| |
if ($i > 0) { |
| |
$datatable .= '</tr>'; |
| |
} |
| |
$datatable .= '<tr>'; |
| |
} |
| |
$datatable .= '<td class="LC_left_item">'. |
| |
'<span class="LC_nobreak"><label>'. |
| |
'<input type="checkbox" name="'.$prefix.'_'.$type. |
| |
'" value="'.$value.'"'.$checkedtype.' />'.$showloc. |
| |
'</label></span></td>'; |
| } |
} |
| } |
$rem = @locations%($numinrow); |
| $rem = $i%($numinrow); |
my $colsleft = $numinrow - $rem; |
| if ($rem == 0) { |
if ($colsleft > 1 ) { |
| if ($i > 0) { |
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
| $datatable .= '</tr>'; |
' </td>'; |
| |
} elsif ($colsleft == 1) { |
| |
$datatable .= '<td class="LC_left_item"> </td>'; |
| } |
} |
| $datatable .= '<tr>'; |
$datatable .= '</tr></table>'; |
| } |
} |
| $datatable .= '<td class="LC_left_item">'. |
$datatable .= '</td></tr>'; |
| '<span class="LC_nobreak"><label>'. |
$itemcount ++; |
| '<input type="checkbox" name="'.$prefix.'_'.$type. |
|
| '" value="'.$value.'"'.$checkedtype.' />'.$showloc. |
|
| '</label></span></td>'; |
|
| } |
|
| $rem = @locations%($numinrow); |
|
| my $colsleft = $numinrow - $rem; |
|
| if ($colsleft > 1 ) { |
|
| $datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
|
| ' </td>'; |
|
| } elsif ($colsleft == 1) { |
|
| $datatable .= '<td class="LC_left_item"> </td>'; |
|
| } |
} |
| $datatable .= '</tr></table>'; |
|
| } |
} |
| $datatable .= '</td></tr>'; |
|
| $itemcount ++; |
|
| } |
} |
| $$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
| return $datatable; |
return $datatable; |
|
Line 2446 sub build_location_hashes {
|
Line 2661 sub build_location_hashes {
|
| return; |
return; |
| } |
} |
| |
|
| |
sub current_offloads_to { |
| |
my ($dom,$settings,$servers) = @_; |
| |
my (%spareid,%otherdomconfigs); |
| |
if (ref($servers) eq 'HASH') { |
| |
foreach my $lonhost (sort(keys(%{$servers}))) { |
| |
my $gotspares; |
| |
if (ref($settings) eq 'HASH') { |
| |
if (ref($settings->{'spares'}) eq 'HASH') { |
| |
if (ref($settings->{'spares'}{$lonhost}) eq 'HASH') { |
| |
$spareid{$lonhost}{'primary'} = $settings->{'spares'}{$lonhost}{'primary'}; |
| |
$spareid{$lonhost}{'default'} = $settings->{'spares'}{$lonhost}{'default'}; |
| |
$gotspares = 1; |
| |
} |
| |
} |
| |
} |
| |
unless ($gotspares) { |
| |
my $gotspares; |
| |
my $serverhomeID = |
| |
&Apache::lonnet::get_server_homeID($servers->{$lonhost}); |
| |
my $serverhomedom = |
| |
&Apache::lonnet::host_domain($serverhomeID); |
| |
if ($serverhomedom ne $dom) { |
| |
if (ref($otherdomconfigs{$serverhomedom} eq 'HASH')) { |
| |
if (ref($otherdomconfigs{$serverhomedom}{'usersessions'}) eq 'HASH') { |
| |
if (ref($otherdomconfigs{$serverhomedom}{'usersessions'}{'spares'}) eq 'HASH') { |
| |
$spareid{$lonhost}{'primary'} = $otherdomconfigs{$serverhomedom}{'usersessions'}{'spares'}{'primary'}; |
| |
$spareid{$lonhost}{'default'} = $otherdomconfigs{$serverhomedom}{'usersessions'}{'spares'}{'default'}; |
| |
$gotspares = 1; |
| |
} |
| |
} |
| |
} else { |
| |
$otherdomconfigs{$serverhomedom} = |
| |
&Apache::lonnet::get_dom('configuration',['usersessions'],$serverhomedom); |
| |
if (ref($otherdomconfigs{$serverhomedom}) eq 'HASH') { |
| |
if (ref($otherdomconfigs{$serverhomedom}{'usersessions'}) eq 'HASH') { |
| |
if (ref($otherdomconfigs{$serverhomedom}{'usersessions'}{'spares'}) eq 'HASH') { |
| |
if (ref($otherdomconfigs{$serverhomedom}{'usersessions'}{'spares'}{$lonhost}) eq 'HASH') { |
| |
$spareid{$lonhost}{'primary'} = $otherdomconfigs{$serverhomedom}{'usersessions'}{'spares'}{'primary'}; |
| |
$spareid{$lonhost}{'default'} = $otherdomconfigs{$serverhomedom}{'usersessions'}{'spares'}{'default'}; |
| |
$gotspares = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
unless ($gotspares) { |
| |
if ($lonhost eq $Apache::lonnet::perlvar{'lonHostID'}) { |
| |
$spareid{$lonhost}{'primary'} = $Apache::lonnet::spareid{'primary'}; |
| |
$spareid{$lonhost}{'default'} = $Apache::lonnet::spareid{'default'}; |
| |
} else { |
| |
my $server_hostname = &Apache::lonnet::hostname($lonhost); |
| |
my $server_homeID = &Apache::lonnet::get_server_homeID($server_hostname); |
| |
if ($server_homeID eq $Apache::lonnet::perlvar{'lonHostID'}) { |
| |
$spareid{$lonhost}{'primary'} = $Apache::lonnet::spareid{'primary'}; |
| |
$spareid{$lonhost}{'default'} = $Apache::lonnet::spareid{'default'}; |
| |
} else { |
| |
my %what = ( |
| |
spareid => 1, |
| |
); |
| |
my ($result,$returnhash) = |
| |
&Apache::lonnet::get_remote_globals($lonhost,\%what); |
| |
if ($result eq 'ok') { |
| |
if (ref($returnhash) eq 'HASH') { |
| |
if (ref($returnhash->{'spareid'}) eq 'HASH') { |
| |
$spareid{$lonhost}{'primary'} = $returnhash->{'spareid'}->{'primary'}; |
| |
$spareid{$lonhost}{'default'} = $returnhash->{'spareid'}->{'default'}; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return %spareid; |
| |
} |
| |
|
| |
sub spares_row { |
| |
my ($dom,$servers,$spareid,$serverhomes,$altids,$rowtotal) = @_; |
| |
my $css_class; |
| |
my $numinrow = 4; |
| |
my $itemcount = 1; |
| |
my $datatable; |
| |
my %typetitles = &sparestype_titles(); |
| |
if ((ref($servers) eq 'HASH') && (ref($spareid) eq 'HASH') && (ref($altids) eq 'HASH')) { |
| |
foreach my $server (sort(keys(%{$servers}))) { |
| |
my $serverhome = &Apache::lonnet::get_server_homeID($servers->{$server}); |
| |
my ($othercontrol,$serverdom); |
| |
if ($serverhome ne $server) { |
| |
$serverdom = &Apache::lonnet::host_domain($serverhome); |
| |
$othercontrol = &mt('Session offloading controlled by domain: [_1]','<b>'.$serverdom.'</b>'); |
| |
} else { |
| |
$serverdom = &Apache::lonnet::host_domain($server); |
| |
if ($serverdom ne $dom) { |
| |
$othercontrol = &mt('Session offloading controlled by domain: [_1]','<b>'.$serverdom.'</b>'); |
| |
} |
| |
} |
| |
next unless (ref($spareid->{$server}) eq 'HASH'); |
| |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
| |
$datatable .= '<tr'.$css_class.'> |
| |
<td rowspan="2"> |
| |
<span class="LC_nobreak"><b>'.$server.'</b> when busy, offloads to:</span></td>'."\n"; |
| |
my (%current,%canselect); |
| |
my @choices = |
| |
&possible_newspares($server,$spareid->{$server},$serverhomes,$altids); |
| |
foreach my $type ('primary','default') { |
| |
if (ref($spareid->{$server}) eq 'HASH') { |
| |
if (ref($spareid->{$server}{$type}) eq 'ARRAY') { |
| |
my @spares = @{$spareid->{$server}{$type}}; |
| |
if (@spares > 0) { |
| |
if ($othercontrol) { |
| |
$current{$type} = join(', ',@spares); |
| |
} else { |
| |
$current{$type} .= '<table>'; |
| |
my $numspares = scalar(@spares); |
| |
for (my $i=0; $i<@spares; $i++) { |
| |
my $rem = $i%($numinrow); |
| |
if ($rem == 0) { |
| |
if ($i > 0) { |
| |
$current{$type} .= '</tr>'; |
| |
} |
| |
$current{$type} .= '<tr>'; |
| |
} |
| |
$current{$type} .= '<td><label><input type="checkbox" name="spare_'.$type.'_'.$server.'" id="spare_'.$type.'_'.$server.'_'.$i.'" checked="checked" value="'.$spareid->{$server}{$type}[$i].'" onclick="updateNewSpares(this.form,'."'$server'".');" /> '. |
| |
$spareid->{$server}{$type}[$i]. |
| |
'</label></td>'."\n"; |
| |
} |
| |
my $rem = @spares%($numinrow); |
| |
my $colsleft = $numinrow - $rem; |
| |
if ($colsleft > 1 ) { |
| |
$current{$type} .= '<td colspan="'.$colsleft. |
| |
'" class="LC_left_item">'. |
| |
' </td>'; |
| |
} elsif ($colsleft == 1) { |
| |
$current{$type} .= '<td class="LC_left_item"> </td>'."\n"; |
| |
} |
| |
$current{$type} .= '</tr></table>'; |
| |
} |
| |
} |
| |
} |
| |
if ($current{$type} eq '') { |
| |
$current{$type} = &mt('None specified'); |
| |
} |
| |
if ($othercontrol) { |
| |
if ($type eq 'primary') { |
| |
$canselect{$type} = $othercontrol; |
| |
} |
| |
} else { |
| |
$canselect{$type} = |
| |
&mt('Add new [_1]'.$type.'[_2]:','<i>','</i>').' '. |
| |
'<select name="newspare_'.$type.'_'.$server.'" '. |
| |
'id="newspare_'.$type.'_'.$server.'" onchange="checkNewSpares('."'$server','$type'".');">'."\n". |
| |
'<option value="" selected ="selected">'.&mt('Select').'</option>'."\n"; |
| |
if (@choices > 0) { |
| |
foreach my $lonhost (@choices) { |
| |
$canselect{$type} .= '<option value="'.$lonhost.'">'.$lonhost.'</option>'."\n"; |
| |
} |
| |
} |
| |
$canselect{$type} .= '</select>'."\n"; |
| |
} |
| |
} else { |
| |
$current{$type} = &mt('Could not be determined'); |
| |
if ($type eq 'primary') { |
| |
$canselect{$type} = $othercontrol; |
| |
} |
| |
} |
| |
if ($type eq 'default') { |
| |
$datatable .= '<tr'.$css_class.'>'; |
| |
} |
| |
$datatable .= '<td><i>'.$typetitles{$type}.'</i></td>'."\n". |
| |
'<td>'.$current{$type}.'</td>'."\n". |
| |
'<td>'.$canselect{$type}.'</td></tr>'."\n"; |
| |
} |
| |
$itemcount ++; |
| |
} |
| |
} |
| |
$$rowtotal += $itemcount; |
| |
return $datatable; |
| |
} |
| |
|
| |
sub possible_newspares { |
| |
my ($server,$currspares,$serverhomes,$altids) = @_; |
| |
my $serverhostname = &Apache::lonnet::hostname($server); |
| |
my %excluded; |
| |
if ($serverhostname ne '') { |
| |
%excluded = ( |
| |
$serverhostname => 1, |
| |
); |
| |
} |
| |
if (ref($currspares) eq 'HASH') { |
| |
foreach my $type (keys(%{$currspares})) { |
| |
if (ref($currspares->{$type}) eq 'ARRAY') { |
| |
if (@{$currspares->{$type}} > 0) { |
| |
foreach my $curr (@{$currspares->{$type}}) { |
| |
my $hostname = &Apache::lonnet::hostname($curr); |
| |
$excluded{$hostname} = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
my @choices; |
| |
if ((ref($serverhomes) eq 'HASH') && (ref($altids) eq 'HASH')) { |
| |
if (keys(%{$serverhomes}) > 1) { |
| |
foreach my $name (sort(keys(%{$serverhomes}))) { |
| |
unless ($excluded{$name}) { |
| |
if (exists($altids->{$serverhomes->{$name}})) { |
| |
push(@choices,$altids->{$serverhomes->{$name}}); |
| |
} else { |
| |
push(@choices,$serverhomes->{$name}); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return sort(@choices); |
| |
} |
| |
|
| |
sub print_loadbalancing { |
| |
my ($dom,$settings,$rowtotal) = @_; |
| |
my $primary_id = &Apache::lonnet::domain($dom,'primary'); |
| |
my $intdom = &Apache::lonnet::internet_dom($primary_id); |
| |
my $numinrow = 1; |
| |
my $datatable; |
| |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
| |
my (%currbalancer,%currtargets,%currrules,%existing); |
| |
if (ref($settings) eq 'HASH') { |
| |
%existing = %{$settings}; |
| |
} |
| |
if ((keys(%servers) > 1) || (keys(%existing) > 0)) { |
| |
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer, |
| |
\%currtargets,\%currrules); |
| |
} else { |
| |
return; |
| |
} |
| |
my ($othertitle,$usertypes,$types) = |
| |
&Apache::loncommon::sorted_inst_types($dom); |
| |
my $rownum = 6; |
| |
if (ref($types) eq 'ARRAY') { |
| |
$rownum += scalar(@{$types}); |
| |
} |
| |
my @css_class = ('LC_odd_row','LC_even_row'); |
| |
my $balnum = 0; |
| |
my $islast; |
| |
my (@toshow,$disabledtext); |
| |
if (keys(%currbalancer) > 0) { |
| |
@toshow = sort(keys(%currbalancer)); |
| |
if (scalar(@toshow) < scalar(keys(%servers)) + 1) { |
| |
push(@toshow,''); |
| |
} |
| |
} else { |
| |
@toshow = (''); |
| |
$disabledtext = &mt('No existing load balancer'); |
| |
} |
| |
foreach my $lonhost (@toshow) { |
| |
if ($balnum == scalar(@toshow)-1) { |
| |
$islast = 1; |
| |
} else { |
| |
$islast = 0; |
| |
} |
| |
my $cssidx = $balnum%2; |
| |
my $targets_div_style = 'display: none'; |
| |
my $disabled_div_style = 'display: block'; |
| |
my $homedom_div_style = 'display: none'; |
| |
$datatable .= '<tr class="'.$css_class[$cssidx].'">'. |
| |
'<td rowspan="'.$rownum.'" valign="top">'. |
| |
'<p>'; |
| |
if ($lonhost eq '') { |
| |
$datatable .= '<span class="LC_nobreak">'; |
| |
if (keys(%currbalancer) > 0) { |
| |
$datatable .= &mt('Add balancer:'); |
| |
} else { |
| |
$datatable .= &mt('Enable balancer:'); |
| |
} |
| |
$datatable .= ' '. |
| |
'<select name="loadbalancing_lonhost_'.$balnum.'"'. |
| |
' id="loadbalancing_lonhost_'.$balnum.'"'. |
| |
' onchange="toggleTargets('."'$balnum'".');">'."\n". |
| |
'<option value="" selected="selected">'.&mt('None'). |
| |
'</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>'; |
| |
} |
| |
} |
| |
} |
| |
if ($targettable ne '') { |
| |
my $rem = $numspares%($numinrow); |
| |
my $colsleft = $numinrow - $rem; |
| |
if ($colsleft > 1 ) { |
| |
$targettable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
| |
' </td>'; |
| |
} elsif ($colsleft == 1) { |
| |
$targettable .= '<td class="LC_left_item"> </td>'; |
| |
} |
| |
$datatable .= '<i>'.$typetitles{$sparetype}.'</i><br />'. |
| |
'<table><tr>'.$targettable.'</tr></table><br />'; |
| |
} |
| |
} |
| |
my $cssidx = $balnum%2; |
| |
$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'}; |
| |
} |
| |
} |
| |
} else { |
| |
my ($balancerref,$targetsref) = |
| |
&Apache::lonnet::get_lonbalancer_config($servers); |
| |
if ((ref($balancerref) eq 'HASH') && (ref($targetsref) eq 'HASH')) { |
| |
foreach my $server (sort(keys(%{$balancerref}))) { |
| |
$currbalancer->{$server} = 1; |
| |
$currtargets->{$server} = $targetsref->{$server}; |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub loadbalancing_rules { |
| |
my ($dom,$intdom,$currrules,$othertitle,$usertypes,$types,$servers, |
| |
$currbalancer,$lonhost,$targets_div_style,$homedom_div_style, |
| |
$css_class,$balnum,$islast) = @_; |
| |
my $output; |
| |
my $num = 0; |
| |
my ($alltypes,$othertypes,$titles) = |
| |
&loadbalancing_titles($dom,$intdom,$usertypes,$types); |
| |
if ((ref($alltypes) eq 'ARRAY') && (ref($titles) eq 'HASH')) { |
| |
foreach my $type (@{$alltypes}) { |
| |
$num ++; |
| |
my $current; |
| |
if (ref($currrules) eq 'HASH') { |
| |
$current = $currrules->{$type}; |
| |
} |
| |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) { |
| |
if ($dom ne &Apache::lonnet::host_domain($lonhost)) { |
| |
$current = ''; |
| |
} |
| |
} |
| |
$output .= &loadbalance_rule_row($type,$titles->{$type},$current, |
| |
$servers,$currbalancer,$lonhost,$dom, |
| |
$targets_div_style,$homedom_div_style, |
| |
$css_class,$balnum,$num,$islast); |
| |
} |
| |
} |
| |
return $output; |
| |
} |
| |
|
| |
sub loadbalancing_titles { |
| |
my ($dom,$intdom,$usertypes,$types) = @_; |
| |
my %othertypes = ( |
| |
'_LC_adv' => &mt('Advanced users from [_1]',$dom), |
| |
'_LC_author' => &mt('Users from [_1] with author role',$dom), |
| |
'_LC_internetdom' => &mt('Users not from [_1], but from [_2]',$dom,$intdom), |
| |
'_LC_external' => &mt('Users not from [_1]',$intdom), |
| |
); |
| |
my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external'); |
| |
if (ref($types) eq 'ARRAY') { |
| |
unshift(@alltypes,@{$types},'default'); |
| |
} |
| |
my %titles; |
| |
foreach my $type (@alltypes) { |
| |
if ($type =~ /^_LC_/) { |
| |
$titles{$type} = $othertypes{$type}; |
| |
} elsif ($type eq 'default') { |
| |
$titles{$type} = &mt('All users from [_1]',$dom); |
| |
if (ref($types) eq 'ARRAY') { |
| |
if (@{$types} > 0) { |
| |
$titles{$type} = &mt('Other users from [_1]',$dom); |
| |
} |
| |
} |
| |
} elsif (ref($usertypes) eq 'HASH') { |
| |
$titles{$type} = $usertypes->{$type}; |
| |
} |
| |
} |
| |
return (\@alltypes,\%othertypes,\%titles); |
| |
} |
| |
|
| |
sub loadbalance_rule_row { |
| |
my ($type,$title,$current,$servers,$currbalancer,$lonhost,$dom, |
| |
$targets_div_style,$homedom_div_style,$css_class,$balnum,$num,$islast) = @_; |
| |
my @rulenames = ('default','homeserver'); |
| |
my %ruletitles = &offloadtype_text(); |
| |
if ($type eq '_LC_external') { |
| |
push(@rulenames,'externalbalancer'); |
| |
} else { |
| |
push(@rulenames,'specific'); |
| |
} |
| |
push(@rulenames,'none'); |
| |
my $style = $targets_div_style; |
| |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) { |
| |
$style = $homedom_div_style; |
| |
} |
| |
my $space; |
| |
if ($islast && $num == 1) { |
| |
$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++) { |
| |
my $rule = $rulenames[$i]; |
| |
my ($checked,$extra); |
| |
if ($rulenames[$i] eq 'default') { |
| |
$rule = ''; |
| |
} |
| |
if ($rulenames[$i] eq 'specific') { |
| |
if (ref($servers) eq 'HASH') { |
| |
my $default; |
| |
if (($current ne '') && (exists($servers->{$current}))) { |
| |
$checked = ' checked="checked"'; |
| |
} |
| |
unless ($checked) { |
| |
$default = ' selected="selected"'; |
| |
} |
| |
$extra = |
| |
': <select name="loadbalancing_singleserver_'.$balnum.'_'.$type. |
| |
'" id="loadbalancing_singleserver_'.$balnum.'_'.$type. |
| |
'" onchange="singleServerToggle('."'$balnum','$type'".')">'."\n". |
| |
'<option value=""'.$default.'></option>'."\n"; |
| |
foreach my $server (sort(keys(%{$servers}))) { |
| |
if (ref($currbalancer) eq 'HASH') { |
| |
next if (exists($currbalancer->{$server})); |
| |
} |
| |
my $selected; |
| |
if ($server eq $current) { |
| |
$selected = ' selected="selected"'; |
| |
} |
| |
$extra .= '<option value="'.$server.'"'.$selected.'>'.$server.'</option>'; |
| |
} |
| |
$extra .= '</select>'; |
| |
} |
| |
} elsif ($rule eq $current) { |
| |
$checked = ' checked="checked"'; |
| |
} |
| |
$output .= '<span class="LC_nobreak"><label>'. |
| |
'<input type="radio" name="loadbalancing_rules_'.$balnum.'_'.$type. |
| |
'" id="loadbalancing_rules_'.$balnum.'_'.$type.'_'.$i.'" value="'. |
| |
$rule.'" onclick="balanceruleChange('."this.form,'$balnum','$type'". |
| |
')"'.$checked.' /> '.$ruletitles{$rulenames[$i]}. |
| |
'</label>'.$extra.'</span><br />'."\n"; |
| |
} |
| |
$output .= '</div></td></tr>'."\n"; |
| |
return $output; |
| |
} |
| |
|
| |
sub offloadtype_text { |
| |
my %ruletitles = &Apache::lonlocal::texthash ( |
| |
'default' => 'Offloads to default destinations', |
| |
'homeserver' => "Offloads to user's home server", |
| |
'externalbalancer' => "Offloads to Load Balancer in user's domain", |
| |
'specific' => 'Offloads to specific server', |
| |
'none' => 'No offload', |
| |
); |
| |
return %ruletitles; |
| |
} |
| |
|
| |
sub sparestype_titles { |
| |
my %typestitles = &Apache::lonlocal::texthash ( |
| |
'primary' => 'primary', |
| |
'default' => 'default', |
| |
); |
| |
return %typestitles; |
| |
} |
| |
|
| sub contact_titles { |
sub contact_titles { |
| my %titles = &Apache::lonlocal::texthash ( |
my %titles = &Apache::lonlocal::texthash ( |
| 'supportemail' => 'Support E-mail address', |
'supportemail' => 'Support E-mail address', |
|
Line 2465 sub contact_titles {
|
Line 3232 sub contact_titles {
|
| |
|
| sub tool_titles { |
sub tool_titles { |
| my %titles = &Apache::lonlocal::texthash ( |
my %titles = &Apache::lonlocal::texthash ( |
| aboutme => 'Personal Information Page', |
aboutme => 'Personal web page', |
| blog => 'Blog', |
blog => 'Blog', |
| |
webdav => 'WebDAV', |
| portfolio => 'Portfolio', |
portfolio => 'Portfolio', |
| official => 'Official courses (with institutional codes)', |
official => 'Official courses (with institutional codes)', |
| unofficial => 'Unofficial courses', |
unofficial => 'Unofficial courses', |
|
Line 2489 sub courserequest_titles {
|
Line 3257 sub courserequest_titles {
|
| return %titles; |
return %titles; |
| } |
} |
| |
|
| |
sub authorrequest_titles { |
| |
my %titles = &Apache::lonlocal::texthash ( |
| |
norequest => 'Not allowed', |
| |
approval => 'Approval by Dom. Coord.', |
| |
automatic => 'Automatic approval', |
| |
); |
| |
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).', |
|
Line 2618 sub print_usercreation {
|
Line 3395 sub print_usercreation {
|
| } |
} |
| my ($othertitle,$usertypes,$types) = |
my ($othertitle,$usertypes,$types) = |
| &Apache::loncommon::sorted_inst_types($dom); |
&Apache::loncommon::sorted_inst_types($dom); |
| |
my $createsettings; |
| |
if (ref($settings) eq 'HASH') { |
| |
$createsettings = $settings->{cancreate}; |
| |
} |
| if (ref($usertypes) eq 'HASH') { |
if (ref($usertypes) eq 'HASH') { |
| if (keys(%{$usertypes}) > 0) { |
if (keys(%{$usertypes}) > 0) { |
| my $createsettings; |
|
| if (ref($settings) eq 'HASH') { |
|
| $createsettings = $settings->{cancreate}; |
|
| } |
|
| $datatable .= &insttypes_row($createsettings,$types,$usertypes, |
$datatable .= &insttypes_row($createsettings,$types,$usertypes, |
| $dom,$numinrow,$othertitle, |
$dom,$numinrow,$othertitle, |
| 'statustocreate'); |
'statustocreate'); |
| $$rowtotal ++; |
$$rowtotal ++; |
| |
$rownum ++; |
| } |
} |
| } |
} |
| |
$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 2681 sub print_usercreation {
|
Line 3460 sub print_usercreation {
|
| return $datatable; |
return $datatable; |
| } |
} |
| |
|
| |
sub captcha_choice { |
| |
my ($context,$settings,$itemcount) = @_; |
| |
my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext); |
| |
my %lt = &captcha_phrases(); |
| |
$keyentry = 'hidden'; |
| |
if ($context eq 'cancreate') { |
| |
$rowname = &mt('CAPTCHA validation (e-mail as username)'); |
| |
} elsif ($context eq 'login') { |
| |
$rowname = &mt('"Contact helpdesk" CAPTCHA validation'); |
| |
} |
| |
if (ref($settings) eq 'HASH') { |
| |
if ($settings->{'captcha'}) { |
| |
$checked{$settings->{'captcha'}} = ' checked="checked"'; |
| |
} else { |
| |
$checked{'original'} = ' checked="checked"'; |
| |
} |
| |
if ($settings->{'captcha'} eq 'recaptcha') { |
| |
$pubtext = $lt{'pub'}; |
| |
$privtext = $lt{'priv'}; |
| |
$keyentry = 'text'; |
| |
} |
| |
if (ref($settings->{'recaptchakeys'}) eq 'HASH') { |
| |
$currpub = $settings->{'recaptchakeys'}{'public'}; |
| |
$currpriv = $settings->{'recaptchakeys'}{'private'}; |
| |
} |
| |
} else { |
| |
$checked{'original'} = ' checked="checked"'; |
| |
} |
| |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
| |
my $output = '<tr'.$css_class.'>'. |
| |
'<td class="LC_left_item">'.$rowname.'</td><td class="LC_left_item" colspan="2">'."\n". |
| |
'<table><tr><td>'."\n"; |
| |
foreach my $option ('original','recaptcha','notused') { |
| |
$output .= '<span class="LC_nobreak"><label><input type="radio" name="'.$context.'_captcha" value="'. |
| |
$option.'" '.$checked{$option}.' onchange="javascript:updateCaptcha('."this,'$context'".');" />'. |
| |
$lt{$option}.'</label></span>'; |
| |
unless ($option eq 'notused') { |
| |
$output .= (' 'x2)."\n"; |
| |
} |
| |
} |
| |
# |
| |
# 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 |
| |
# 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. |
| |
# |
| |
$output .= '</td></tr>'."\n". |
| |
'<tr><td>'."\n". |
| |
'<span class="LC_nobreak"><span id="'.$context.'_recaptchapubtxt">'.$pubtext.'</span> '."\n". |
| |
'<input type="'.$keyentry.'" id="'.$context.'_recaptchapub" name="'.$context.'_recaptchapub" value="'. |
| |
$currpub.'" size="40" /></span><br />'."\n". |
| |
'<span class="LC_nobreak"><span id="'.$context.'_recaptchaprivtxt">'.$privtext.'</span> '."\n". |
| |
'<input type="'.$keyentry.'" id="'.$context.'_recaptchapriv" name="'.$context.'_recaptchapriv" value="'. |
| |
$currpriv.'" size="40" /></span></td></tr></table>'."\n". |
| |
'</td></tr>'; |
| |
return $output; |
| |
} |
| |
|
| sub user_formats_row { |
sub user_formats_row { |
| my ($type,$settings,$rules,$ruleorder,$numinrow,$rowcount) = @_; |
my ($type,$settings,$rules,$ruleorder,$numinrow,$rowcount) = @_; |
| my $output; |
my $output; |
|
Line 2855 sub print_defaults {
|
Line 3692 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 2870 sub print_defaults {
|
Line 3713 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 3331 sub print_serverstatuses {
|
Line 4185 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', |
'clusterstatus','metadata_keywords','metadata_harvest', |
| 'takeoffline','takeonline','showenv','toggledebug'); |
'takeoffline','takeonline','showenv','toggledebug','ping','domconf'); |
| } |
} |
| |
|
| sub coursecategories_javascript { |
sub coursecategories_javascript { |
|
Line 3645 sub insttypes_row {
|
Line 4499 sub insttypes_row {
|
| if ($context eq 'cansearch') { |
if ($context eq 'cansearch') { |
| $showdom = ' ('.$dom.')'; |
$showdom = ' ('.$dom.')'; |
| } |
} |
| |
my $class = 'LC_left_item'; |
| |
if ($context eq 'statustocreate') { |
| |
$class = 'LC_right_item'; |
| |
} |
| my $output = '<tr class="LC_odd_row">'. |
my $output = '<tr class="LC_odd_row">'. |
| '<td>'.$lt{$context}.$showdom. |
'<td>'.$lt{$context}.$showdom. |
| '</td><td class="LC_left_item" colspan="2"><table>'; |
'</td><td class="'.$class.'" colspan="2"><table>'; |
| my $rem; |
my $rem; |
| if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
| for (my $i=0; $i<@{$types}; $i++) { |
for (my $i=0; $i<@{$types}; $i++) { |
|
Line 3777 sub usertype_update_row {
|
Line 4635 sub usertype_update_row {
|
| |
|
| sub modify_login { |
sub modify_login { |
| my ($r,$dom,$confname,%domconfig) = @_; |
my ($r,$dom,$confname,%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'); |
newuser => 'Link for visitors to create a user account', |
| my @offon = ('off','on'); |
loginheader => 'Log-in box header'); |
| my %curr_loginvia; |
@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 3791 sub modify_login {
|
Line 4649 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','newuser'); |
|
Line 3804 sub modify_login {
|
Line 4661 sub modify_login {
|
| \%loginhash); |
\%loginhash); |
| } |
} |
| |
|
| my %servers = &dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
| my @loginvia_attribs = ('serverpath','custompath','exempt'); |
my @loginvia_attribs = ('serverpath','custompath','exempt'); |
| if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
| foreach my $lonhost (keys(%servers)) { |
foreach my $lonhost (keys(%servers)) { |
|
Line 3864 sub modify_login {
|
Line 4721 sub modify_login {
|
| $new = ''; |
$new = ''; |
| } |
} |
| } |
} |
| |
|
| $loginhash{login}{loginvia}{$lonhost}{$item} = $new; |
$loginhash{login}{loginvia}{$lonhost}{$item} = $new; |
| } |
} |
| } |
} |
|
Line 3890 sub modify_login {
|
Line 4746 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') { |
|
Line 3955 sub modify_login {
|
Line 4901 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 4399 sub publishlogo {
|
Line 5407 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 $filepath='/home/'.$confname.'/public_html'; |
my $docroot=$r->dir_config('lonDocRoot'); |
| |
my $filepath="$docroot/priv"; |
| |
my $relpath = "$dom/$confname"; |
| my ($fnamepath,$file,$fetchthumb); |
my ($fnamepath,$file,$fetchthumb); |
| $file=$fname; |
$file=$fname; |
| if ($fname=~m|/|) { |
if ($fname=~m|/|) { |
| ($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|); |
($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|); |
| } |
} |
| my @parts=split(/\//,$filepath.'/'.$fnamepath); |
my @parts=split(/\//,"$filepath/$relpath/$fnamepath"); |
| my $count; |
my $count; |
| for ($count=4;$count<=$#parts;$count++) { |
for ($count=5;$count<=$#parts;$count++) { |
| $filepath.="/$parts[$count]"; |
$filepath.="/$parts[$count]"; |
| if ((-e $filepath)!=1) { |
if ((-e $filepath)!=1) { |
| mkdir($filepath,02770); |
mkdir($filepath,02770); |
|
Line 4454 $env{'user.name'}.':'.$env{'user.domain'
|
Line 5464 $env{'user.name'}.':'.$env{'user.domain'
|
| close(FH); |
close(FH); |
| chmod(0660, $source); # Permissions to rw-rw---. |
chmod(0660, $source); # Permissions to rw-rw---. |
| |
|
| my $docroot=$r->dir_config('lonDocRoot'); |
|
| my $targetdir=$docroot.'/res/'.$dom.'/'.$confname .'/'.$fnamepath; |
my $targetdir=$docroot.'/res/'.$dom.'/'.$confname .'/'.$fnamepath; |
| my $copyfile=$targetdir.'/'.$file; |
my $copyfile=$targetdir.'/'.$file; |
| |
|
|
Line 4477 $env{'user.name'}.':'.$env{'user.domain'
|
Line 5486 $env{'user.name'}.':'.$env{'user.domain'
|
| if (copy($source,$copyfile)) { |
if (copy($source,$copyfile)) { |
| print $logfile "\nCopied original source to ".$copyfile."\n"; |
print $logfile "\nCopied original source to ".$copyfile."\n"; |
| $output = 'ok'; |
$output = 'ok'; |
| &write_metadata($dom,$confname,$formname,$targetdir,$file,$logfile); |
|
| $logourl = '/res/'.$dom.'/'.$confname.'/'.$fname; |
$logourl = '/res/'.$dom.'/'.$confname.'/'.$fname; |
| |
push(@{$modified_urls},[$copyfile,$source]); |
| |
my $metaoutput = |
| |
&write_metadata($dom,$confname,$formname,$targetdir,$file,$logfile); |
| |
unless ($registered_cleanup) { |
| |
my $handlers = $r->get_handlers('PerlCleanupHandler'); |
| |
$r->set_handlers('PerlCleanupHandler' => [\¬ifysubscribed,@{$handlers}]); |
| |
$registered_cleanup=1; |
| |
} |
| } else { |
} else { |
| print $logfile "\nUnable to write ".$copyfile.':'.$!."\n"; |
print $logfile "\nUnable to write ".$copyfile.':'.$!."\n"; |
| $output = &mt('Failed to copy file to RES space').", $!"; |
$output = &mt('Failed to copy file to RES space').", $!"; |
|
Line 4496 $env{'user.name'}.':'.$env{'user.domain'
|
Line 5512 $env{'user.name'}.':'.$env{'user.domain'
|
| my $copyfile=$targetdir.'/tn-'.$file; |
my $copyfile=$targetdir.'/tn-'.$file; |
| if (copy($outfile,$copyfile)) { |
if (copy($outfile,$copyfile)) { |
| print $logfile "\nCopied source to ".$copyfile."\n"; |
print $logfile "\nCopied source to ".$copyfile."\n"; |
| &write_metadata($dom,$confname,$formname, |
my $thumb_metaoutput = |
| $targetdir,'tn-'.$file,$logfile); |
&write_metadata($dom,$confname,$formname, |
| |
$targetdir,'tn-'.$file,$logfile); |
| |
push(@{$modified_urls},[$copyfile,$outfile]); |
| |
unless ($registered_cleanup) { |
| |
my $handlers = $r->get_handlers('PerlCleanupHandler'); |
| |
$r->set_handlers('PerlCleanupHandler' => [\¬ifysubscribed,@{$handlers}]); |
| |
$registered_cleanup=1; |
| |
} |
| } else { |
} else { |
| print $logfile "\nUnable to write ".$copyfile. |
print $logfile "\nUnable to write ".$copyfile. |
| ':'.$!."\n"; |
':'.$!."\n"; |
|
Line 4562 sub write_metadata {
|
Line 5585 sub write_metadata {
|
| { |
{ |
| print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file; |
print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file; |
| my $mfh; |
my $mfh; |
| unless (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) { |
if (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) { |
| |
foreach (sort keys %metadatafields) { |
| |
unless ($_=~/\./) { |
| |
my $unikey=$_; |
| |
$unikey=~/^([A-Za-z]+)/; |
| |
my $tag=$1; |
| |
$tag=~tr/A-Z/a-z/; |
| |
print $mfh "\n\<$tag"; |
| |
foreach (split(/\,/,$metadatakeys{$unikey})) { |
| |
my $value=$metadatafields{$unikey.'.'.$_}; |
| |
$value=~s/\"/\'\'/g; |
| |
print $mfh ' '.$_.'="'.$value.'"'; |
| |
} |
| |
print $mfh '>'. |
| |
&HTML::Entities::encode($metadatafields{$unikey},'<>&"') |
| |
.'</'.$tag.'>'; |
| |
} |
| |
} |
| |
$output = 'ok'; |
| |
print $logfile "\nWrote metadata"; |
| |
close($mfh); |
| |
} else { |
| |
print $logfile "\nFailed to open metadata file"; |
| $output = &mt('Could not write metadata'); |
$output = &mt('Could not write metadata'); |
| } |
} |
| foreach (sort keys %metadatafields) { |
|
| unless ($_=~/\./) { |
|
| my $unikey=$_; |
|
| $unikey=~/^([A-Za-z]+)/; |
|
| my $tag=$1; |
|
| $tag=~tr/A-Z/a-z/; |
|
| print $mfh "\n\<$tag"; |
|
| foreach (split(/\,/,$metadatakeys{$unikey})) { |
|
| my $value=$metadatafields{$unikey.'.'.$_}; |
|
| $value=~s/\"/\'\'/g; |
|
| print $mfh ' '.$_.'="'.$value.'"'; |
|
| } |
|
| print $mfh '>'. |
|
| &HTML::Entities::encode($metadatafields{$unikey},'<>&"') |
|
| .'</'.$tag.'>'; |
|
| } |
|
| } |
|
| $output = 'ok'; |
|
| print $logfile "\nWrote metadata"; |
|
| close($mfh); |
|
| } |
} |
| |
return $output; |
| |
} |
| |
|
| |
sub notifysubscribed { |
| |
foreach my $targetsource (@{$modified_urls}){ |
| |
next unless (ref($targetsource) eq 'ARRAY'); |
| |
my ($target,$source)=@{$targetsource}; |
| |
if ($source ne '') { |
| |
if (open(my $logfh,'>>'.$source.'.log')) { |
| |
print $logfh "\nCleanup phase: Notifications\n"; |
| |
my @subscribed=&subscribed_hosts($target); |
| |
foreach my $subhost (@subscribed) { |
| |
print $logfh "\nNotifying host ".$subhost.':'; |
| |
my $reply=&Apache::lonnet::critical('update:'.$target,$subhost); |
| |
print $logfh $reply; |
| |
} |
| |
my @subscribedmeta=&subscribed_hosts("$target.meta"); |
| |
foreach my $subhost (@subscribedmeta) { |
| |
print $logfh "\nNotifying host for metadata only ".$subhost.':'; |
| |
my $reply=&Apache::lonnet::critical('update:'.$target.'.meta', |
| |
$subhost); |
| |
print $logfh $reply; |
| |
} |
| |
print $logfh "\n============ Done ============\n"; |
| |
close($logfh); |
| |
} |
| |
} |
| |
} |
| |
return OK; |
| |
} |
| |
|
| |
sub subscribed_hosts { |
| |
my ($target) = @_; |
| |
my @subscribed; |
| |
if (open(my $fh,"<$target.subscription")) { |
| |
while (my $subline=<$fh>) { |
| |
if ($subline =~ /^($match_lonid):/) { |
| |
my $host = $1; |
| |
if ($host ne $Apache::lonnet::perlvar{'lonHostID'}) { |
| |
unless (grep(/^\Q$host\E$/,@subscribed)) { |
| |
push(@subscribed,$host); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return @subscribed; |
| } |
} |
| |
|
| sub check_switchserver { |
sub check_switchserver { |
|
Line 4609 sub modify_quotas {
|
Line 5681 sub modify_quotas {
|
| %limithash,$toolregexp,%conditions,$resulttext,%changes); |
%limithash,$toolregexp,%conditions,$resulttext,%changes); |
| if ($action eq 'quotas') { |
if ($action eq 'quotas') { |
| $context = 'tools'; |
$context = 'tools'; |
| } else { |
} else { |
| $context = $action; |
$context = $action; |
| } |
} |
| if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
|
Line 4619 sub modify_quotas {
|
Line 5691 sub modify_quotas {
|
| %titles = &courserequest_titles(); |
%titles = &courserequest_titles(); |
| $toolregexp = join('|',@usertools); |
$toolregexp = join('|',@usertools); |
| %conditions = &courserequest_conditions(); |
%conditions = &courserequest_conditions(); |
| |
} elsif ($context eq 'requestauthor') { |
| |
@usertools = ('author'); |
| |
%titles = &authorrequest_titles(); |
| } else { |
} else { |
| @usertools = ('aboutme','blog','portfolio'); |
@usertools = ('aboutme','blog','webdav','portfolio'); |
| %titles = &tool_titles(); |
%titles = &tool_titles(); |
| } |
} |
| my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
|
Line 4636 sub modify_quotas {
|
Line 5711 sub modify_quotas {
|
| $confhash{$item}{$type} = $env{$key}; |
$confhash{$item}{$type} = $env{$key}; |
| } |
} |
| } |
} |
| |
} elsif ($context eq 'requestauthor') { |
| |
if ($key =~ /^\Qform.authorreq_\E(.+)$/) { |
| |
$confhash{$1} = $env{$key}; |
| |
} |
| } else { |
} else { |
| if ($key =~ /^form\.quota_(.+)$/) { |
if ($key =~ /^form\.quota_(.+)$/) { |
| $confhash{'defaultquota'}{$1} = $env{$key}; |
$confhash{'defaultquota'}{$1} = $env{$key}; |
|
Line 4645 sub modify_quotas {
|
Line 5724 sub modify_quotas {
|
| } |
} |
| } |
} |
| } |
} |
| if ($context eq 'requestcourses') { |
if (($context eq 'requestcourses') || ($context eq 'requestauthor')) { |
| my @approvalnotify = &Apache::loncommon::get_env_multiple('form.reqapprovalnotify'); |
my @approvalnotify = &Apache::loncommon::get_env_multiple('form.reqapprovalnotify'); |
| @approvalnotify = sort(@approvalnotify); |
@approvalnotify = sort(@approvalnotify); |
| $confhash{'notify'}{'approval'} = join(',',@approvalnotify); |
$confhash{'notify'}{'approval'} = join(',',@approvalnotify); |
|
Line 4655 sub modify_quotas {
|
Line 5734 sub modify_quotas {
|
| $changes{'notify'}{'approval'} = 1; |
$changes{'notify'}{'approval'} = 1; |
| } |
} |
| } else { |
} else { |
| if ($domconfig{$action}{'notify'}{'approval'}) { |
if ($confhash{'notify'}{'approval'}) { |
| $changes{'notify'}{'approval'} = 1; |
$changes{'notify'}{'approval'} = 1; |
| } |
} |
| } |
} |
| } else { |
} else { |
| if ($domconfig{$action}{'notify'}{'approval'}) { |
if ($confhash{'notify'}{'approval'}) { |
| $changes{'notify'}{'approval'} = 1; |
$changes{'notify'}{'approval'} = 1; |
| } |
} |
| } |
} |
|
Line 4681 sub modify_quotas {
|
Line 5760 sub modify_quotas {
|
| $confhash{$item}{$type} .= $limithash{$item}{$type}; |
$confhash{$item}{$type} .= $limithash{$item}{$type}; |
| } |
} |
| } |
} |
| |
} elsif ($context eq 'requestauthor') { |
| |
$unset = '0'; |
| |
if ($type eq '_LC_adv') { |
| |
$unset = ''; |
| |
} |
| } else { |
} else { |
| if (grep(/^\Q$type\E$/,@{$toolshash{$item}})) { |
if (grep(/^\Q$type\E$/,@{$toolshash{$item}})) { |
| $confhash{$item}{$type} = 1; |
$confhash{$item}{$type} = 1; |
|
Line 4689 sub modify_quotas {
|
Line 5773 sub modify_quotas {
|
| } |
} |
| } |
} |
| if (ref($domconfig{$action}) eq 'HASH') { |
if (ref($domconfig{$action}) eq 'HASH') { |
| if (ref($domconfig{$action}{$item}) eq 'HASH') { |
if ($action eq 'requestauthor') { |
| |
if ($domconfig{$action}{$type} ne $confhash{$type}) { |
| |
$changes{$type} = 1; |
| |
} |
| |
} elsif (ref($domconfig{$action}{$item}) eq 'HASH') { |
| if ($domconfig{$action}{$item}{$type} ne $confhash{$item}{$type}) { |
if ($domconfig{$action}{$item}{$type} ne $confhash{$item}{$type}) { |
| $changes{$item}{$type} = 1; |
$changes{$item}{$type} = 1; |
| } |
} |
|
Line 4709 sub modify_quotas {
|
Line 5797 sub modify_quotas {
|
| if ($confhash{$item}{$type} ne $unset) { |
if ($confhash{$item}{$type} ne $unset) { |
| $changes{$item}{$type} = 1; |
$changes{$item}{$type} = 1; |
| } |
} |
| |
} elsif ($context eq 'requestauthor') { |
| |
if ($confhash{$type} ne $unset) { |
| |
$changes{$type} = 1; |
| |
} |
| } else { |
} else { |
| if (!$confhash{$item}{$type}) { |
if (!$confhash{$item}{$type}) { |
| $changes{$item}{$type} = 1; |
$changes{$item}{$type} = 1; |
|
Line 4717 sub modify_quotas {
|
Line 5809 sub modify_quotas {
|
| } |
} |
| } |
} |
| } |
} |
| unless ($context eq 'requestcourses') { |
unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) { |
| if (ref($domconfig{'quotas'}) eq 'HASH') { |
if (ref($domconfig{'quotas'}) eq 'HASH') { |
| if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') { |
if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') { |
| foreach my $key (keys(%{$domconfig{'quotas'}{'defaultquota'}})) { |
foreach my $key (keys(%{$domconfig{'quotas'}{'defaultquota'}})) { |
|
Line 4760 sub modify_quotas {
|
Line 5852 sub modify_quotas {
|
| } |
} |
| } |
} |
| |
|
| foreach my $key (keys(%confhash)) { |
if ($context eq 'requestauthor') { |
| $domdefaults{$key} = $confhash{$key}; |
$domdefaults{'requestauthor'} = \%confhash; |
| |
} else { |
| |
foreach my $key (keys(%confhash)) { |
| |
$domdefaults{$key} = $confhash{$key}; |
| |
} |
| } |
} |
| |
|
| my %quotahash = ( |
my %quotahash = ( |
| $action => { %confhash } |
$action => { %confhash } |
| ); |
); |
|
Line 4775 sub modify_quotas {
|
Line 5871 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')) { |
| 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>'; |
| foreach my $type (@{$types},'default') { |
foreach my $type (@{$types},'default') { |
|
Line 4792 sub modify_quotas {
|
Line 5889 sub modify_quotas {
|
| } |
} |
| my %newenv; |
my %newenv; |
| foreach my $item (@usertools) { |
foreach my $item (@usertools) { |
| if (ref($changes{$item}) eq 'HASH') { |
my (%haschgs,%inconf); |
| |
if ($context eq 'requestauthor') { |
| |
%haschgs = %changes; |
| |
%inconf = %confhash; |
| |
} else { |
| |
if (ref($changes{$item}) eq 'HASH') { |
| |
%haschgs = %{$changes{$item}}; |
| |
} |
| |
if (ref($confhash{$item}) eq 'HASH') { |
| |
%inconf = %{$confhash{$item}}; |
| |
} |
| |
} |
| |
if (keys(%haschgs) > 0) { |
| my $newacc = |
my $newacc = |
| &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')) { |
| 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 4806 sub modify_quotas {
|
Line 5916 sub modify_quotas {
|
| $newenv{'environment.availabletools.'.$item} = $newacc; |
$newenv{'environment.availabletools.'.$item} = $newacc; |
| } |
} |
| } |
} |
| $resulttext .= '<li>'.$titles{$item}.'<ul>'; |
unless ($context eq 'requestauthor') { |
| |
$resulttext .= '<li>'.$titles{$item}.'<ul>'; |
| |
} |
| foreach my $type (@{$types},'default','_LC_adv') { |
foreach my $type (@{$types},'default','_LC_adv') { |
| if ($changes{$item}{$type}) { |
if ($haschgs{$type}) { |
| my $typetitle = $usertypes->{$type}; |
my $typetitle = $usertypes->{$type}; |
| if ($type eq 'default') { |
if ($type eq 'default') { |
| $typetitle = $othertitle; |
$typetitle = $othertitle; |
| } elsif ($type eq '_LC_adv') { |
} elsif ($type eq '_LC_adv') { |
| $typetitle = 'LON-CAPA Advanced Users'; |
$typetitle = 'LON-CAPA Advanced Users'; |
| } |
} |
| if ($confhash{$item}{$type}) { |
if ($inconf{$type}) { |
| if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
| my $cond; |
my $cond; |
| if ($confhash{$item}{$type} =~ /^autolimit=(\d*)$/) { |
if ($inconf{$type} =~ /^autolimit=(\d*)$/) { |
| if ($1 eq '') { |
if ($1 eq '') { |
| $cond = &mt('(Automatic processing of any request).'); |
$cond = &mt('(Automatic processing of any request).'); |
| } else { |
} else { |
| $cond = &mt('(Automatic processing of requests up to limit of [quant,_1,request] per user).',$1); |
$cond = &mt('(Automatic processing of requests up to limit of [quant,_1,request] per user).',$1); |
| } |
} |
| } else { |
} else { |
| $cond = $conditions{$confhash{$item}{$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>'; |
| } |
} |
| } else { |
} else { |
| if ($type eq '_LC_adv') { |
if ($type eq '_LC_adv') { |
| if ($confhash{$item}{$type} eq '0') { |
if ($inconf{$type} eq '0') { |
| $resulttext .= '<li>'.&mt('Set to be unavailable to [_1]',$typetitle).'</li>'; |
$resulttext .= '<li>'.&mt('Set to be unavailable to [_1]',$typetitle).'</li>'; |
| } else { |
} else { |
| $resulttext .= '<li>'.&mt('No override set for [_1]',$typetitle).'</li>'; |
$resulttext .= '<li>'.&mt('No override set for [_1]',$typetitle).'</li>'; |
|
Line 4844 sub modify_quotas {
|
Line 5960 sub modify_quotas {
|
| } |
} |
| } |
} |
| } |
} |
| $resulttext .= '</ul></li>'; |
unless ($context eq 'requestauthor') { |
| |
$resulttext .= '</ul></li>'; |
| |
} |
| } |
} |
| } |
} |
| if ($action eq 'requestcourses') { |
if (($action eq 'requestcourses') || ($action eq 'requestauthor')) { |
| if (ref($changes{'notify'}) eq 'HASH') { |
if (ref($changes{'notify'}) eq 'HASH') { |
| if ($changes{'notify'}{'approval'}) { |
if ($changes{'notify'}{'approval'}) { |
| if (ref($confhash{'notify'}) eq 'HASH') { |
if (ref($confhash{'notify'}) eq 'HASH') { |
| if ($confhash{'notify'}{'approval'}) { |
if ($confhash{'notify'}{'approval'}) { |
| $resulttext .= '<li>'.&mt('Notification of requests requiring approval will be sent to: ').$confhash{'notify'}{'approval'}.'</li>'; |
$resulttext .= '<li>'.&mt('Notification of requests requiring approval will be sent to: ').$confhash{'notify'}{'approval'}.'</li>'; |
| } else { |
} else { |
| $resulttext .= '<li>'.&mt('No Domain Coordinators will receive notification of course requests requiring approval.').'</li>'; |
$resulttext .= '<li>'.&mt('No Domain Coordinators will receive notification of requests requiring approval.').'</li>'; |
| } |
} |
| } |
} |
| } |
} |
|
Line 4867 sub modify_quotas {
|
Line 5985 sub modify_quotas {
|
| } else { |
} else { |
| if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
| $resulttext = &mt('No changes made to rights to request creation of courses.'); |
$resulttext = &mt('No changes made to rights to request creation of courses.'); |
| |
} elsif ($context eq 'requestauthor') { |
| |
$resulttext = &mt('No changes made to rights to request author space.'); |
| } else { |
} else { |
| $resulttext = &mt('No changes made to availability of personal information pages, blogs, portfolios or default quotas'); |
$resulttext = &mt('No changes made to availability of personal information pages, blogs, portfolios or default quotas'); |
| } |
} |
|
Line 4981 sub modify_autoupdate {
|
Line 6101 sub modify_autoupdate {
|
| middlename => 'Middle Name', |
middlename => 'Middle Name', |
| generation => 'Generation', |
generation => 'Generation', |
| ); |
); |
| my $othertitle = &mt('All users'); |
$othertitle = &mt('All users'); |
| if (keys(%{$usertypes}) > 0) { |
if (keys(%{$usertypes}) > 0) { |
| $othertitle = &mt('Other users'); |
$othertitle = &mt('Other users'); |
| } |
} |
|
Line 5197 sub modify_autocreate {
|
Line 6317 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 5349 sub modify_directorysrch {
|
Line 6472 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 5377 sub modify_directorysrch {
|
Line 6504 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 5561 sub modify_usercreation {
|
Line 6688 sub modify_usercreation {
|
| } |
} |
| push(@contexts,'statustocreate'); |
push(@contexts,'statustocreate'); |
| } |
} |
| |
&process_captcha('cancreate',\%changes,\%cancreate,\%curr_usercreation); |
| if (ref($curr_usercreation{'cancreate'}) eq 'HASH') { |
if (ref($curr_usercreation{'cancreate'}) eq 'HASH') { |
| foreach my $item (@contexts) { |
foreach my $item (@contexts) { |
| if (($item eq 'selfcreate') || ($item eq 'statustocreate')) { |
if (($item eq 'selfcreate') || ($item eq 'statustocreate')) { |
|
Line 5743 sub modify_usercreation {
|
Line 6871 sub modify_usercreation {
|
| my %lt = &usercreation_types(); |
my %lt = &usercreation_types(); |
| foreach my $type (@{$changes{'cancreate'}}) { |
foreach my $type (@{$changes{'cancreate'}}) { |
| my $chgtext; |
my $chgtext; |
| unless ($type eq 'statustocreate') { |
unless (($type eq 'statustocreate') || ($type eq 'captcha') || ($type eq 'recaptchakeys')) { |
| $chgtext = $lt{$type}.', '; |
$chgtext = $lt{$type}.', '; |
| } |
} |
| if ($type eq 'selfcreate') { |
if ($type eq 'selfcreate') { |
|
Line 5802 sub modify_usercreation {
|
Line 6930 sub modify_usercreation {
|
| } |
} |
| } |
} |
| } |
} |
| |
} elsif ($type eq 'captcha') { |
| |
if ($cancreate{$type} eq 'notused') { |
| |
$chgtext .= &mt('No CAPTCHA validation in use for self-creation screen.'); |
| |
} else { |
| |
my %captchas = &captcha_phrases(); |
| |
if ($captchas{$cancreate{$type}}) { |
| |
$chgtext .= &mt("Validation for self-creation screen set to $captchas{$cancreate{$type}}."); |
| |
} else { |
| |
$chgtext .= &mt('Validation for self-creation screen set to unknown type.'); |
| |
} |
| |
} |
| |
} elsif ($type eq 'recaptchakeys') { |
| |
my ($privkey,$pubkey); |
| |
if (ref($cancreate{$type}) eq 'HASH') { |
| |
$pubkey = $cancreate{$type}{'public'}; |
| |
$privkey = $cancreate{$type}{'private'}; |
| |
} |
| |
$chgtext .= &mt('ReCAPTCHA keys changes').'<ul>'; |
| |
if (!$pubkey) { |
| |
$chgtext .= '<li>'.&mt('Public key deleted').'</li>'; |
| |
} else { |
| |
$chgtext .= '<li>'.&mt('Public key set to [_1]',$pubkey).'</li>'; |
| |
} |
| |
if (!$privkey) { |
| |
$chgtext .= '<li>'.&mt('Private key deleted').'</li>'; |
| |
} else { |
| |
$chgtext .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>'; |
| |
} |
| |
$chgtext .= '</ul>'; |
| } else { |
} else { |
| if ($cancreate{$type} eq 'none') { |
if ($cancreate{$type} eq 'none') { |
| $chgtext .= &mt('creation of new users is not permitted, except by a Domain Coordinator.'); |
$chgtext .= &mt('creation of new users is not permitted, except by a Domain Coordinator.'); |
|
Line 5901 sub modify_usercreation {
|
Line 7058 sub modify_usercreation {
|
| return $resulttext; |
return $resulttext; |
| } |
} |
| |
|
| |
sub process_captcha { |
| |
my ($container,$changes,$newsettings,$current) = @_; |
| |
return unless ((ref($changes) eq 'HASH') && (ref($newsettings) eq 'HASH') || (ref($current) eq 'HASH')); |
| |
$newsettings->{'captcha'} = $env{'form.'.$container.'_captcha'}; |
| |
unless ($newsettings->{'captcha'} eq 'recaptcha' || $newsettings->{'captcha'} eq 'notused') { |
| |
$newsettings->{'captcha'} = 'original'; |
| |
} |
| |
if ($current->{'captcha'} ne $newsettings->{'captcha'}) { |
| |
if ($container eq 'cancreate') { |
| |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
| |
push(@{$changes->{'cancreate'}},'captcha'); |
| |
} elsif (!defined($changes->{'cancreate'})) { |
| |
$changes->{'cancreate'} = ['captcha']; |
| |
} |
| |
} else { |
| |
$changes->{'captcha'} = 1; |
| |
} |
| |
} |
| |
my ($newpub,$newpriv,$currpub,$currpriv); |
| |
if ($newsettings->{'captcha'} eq 'recaptcha') { |
| |
$newpub = $env{'form.'.$container.'_recaptchapub'}; |
| |
$newpriv = $env{'form.'.$container.'_recaptchapriv'}; |
| |
$newpub =~ s/\W//g; |
| |
$newpriv =~ s/\W//g; |
| |
$newsettings->{'recaptchakeys'} = { |
| |
public => $newpub, |
| |
private => $newpriv, |
| |
}; |
| |
} |
| |
if (ref($current->{'recaptchakeys'}) eq 'HASH') { |
| |
$currpub = $current->{'recaptchakeys'}{'public'}; |
| |
$currpriv = $current->{'recaptchakeys'}{'private'}; |
| |
$newsettings->{'recaptchakeys'} = { |
| |
public => '', |
| |
private => '', |
| |
} |
| |
} |
| |
if (($newpub ne $currpub) || ($newpriv ne $currpriv)) { |
| |
if ($container eq 'cancreate') { |
| |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
| |
push(@{$changes->{'cancreate'}},'recaptchakeys'); |
| |
} elsif (!defined($changes->{'cancreate'})) { |
| |
$changes->{'cancreate'} = ['recaptchakeys']; |
| |
} |
| |
} else { |
| |
$changes->{'recaptchakeys'} = 1; |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| sub modify_usermodification { |
sub modify_usermodification { |
| my ($dom,%domconfig) = @_; |
my ($dom,%domconfig) = @_; |
| my ($resulttext,%curr_usermodification,%changes); |
my ($resulttext,%curr_usermodification,%changes); |
|
Line 6483 sub modify_serverstatuses {
|
Line 7691 sub modify_serverstatuses {
|
| my %serverstatushash = ( |
my %serverstatushash = ( |
| serverstatuses => \%newserverstatus, |
serverstatuses => \%newserverstatus, |
| ); |
); |
| my %changes; |
|
| foreach my $type (@pages) { |
foreach my $type (@pages) { |
| foreach my $setting ('namedusers','machines') { |
foreach my $setting ('namedusers','machines') { |
| my (@current,@new); |
my (@current,@new); |
|
Line 6558 sub modify_serverstatuses {
|
Line 7765 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 %defaultchecked = ('submitbugs' => 'on'); |
| my $customhelpfile = $env{'form.loginhelpurl.filename'}; |
my @offon = ('off','on'); |
| my $defaulthelpfile = 'defaulthelp.html'; |
|
| my $servadm = $r->dir_config('lonAdmEMail'); |
|
| my ($configuserok,$author_ok,$switchserver) = |
|
| &config_check($dom,$confname,$servadm); |
|
| |
|
| my %defaultchecked = ('submitbugs' => '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') { |
if ($domconfig{'helpsettings'}{$item} eq '') { |
| if (($domconfig{'helpsettings'}{$item} eq '') && |
if ($env{'form.'.$item} eq '0') { |
| ($env{'form.'.$item} eq '0')) { |
$changes{$item} = 1; |
| $changes{$item} = 1; |
} |
| } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) { |
} elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) { |
| $changes{$item} = 1; |
$changes{$item} = 1; |
| } |
} |
| } elsif ($defaultchecked{$item} eq 'off') { |
} elsif ($defaultchecked{$item} eq 'off') { |
| if (($domconfig{'helpsettings'}{$item} eq '') && |
if ($domconfig{'helpsettings'}{$item} eq '') { |
| ($env{'form.'.$item} eq '1')) { |
if ($env{'form.'.$item} eq '1') { |
| $changes{$item} = 1; |
$changes{$item} = 1; |
| } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) { |
} |
| $changes{$item} = 1; |
} elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) { |
| } |
$changes{$item} = 1; |
| } |
} |
| $helphash{'helpsettings'}{$item} = $env{'form.'.$item}; |
} |
| } |
if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) { |
| |
$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'; |
$resulttext = &mt('Changes made:').'<ul>'; |
| } |
foreach my $item (sort(keys(%changes))) { |
| |
if ($item eq 'submitbugs') { |
| if ($putresult eq 'ok') { |
$resulttext .= '<li>'.&mt('Display link to: [_1] set to "'.$offon[$env{'form.'.$item}].'".', |
| if (keys(%changes) > 0) { |
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
| $resulttext = &mt('Changes made:').'<ul>'; |
&mt('LON-CAPA bug tracker'),600,500)).'</li>'; |
| foreach my $item (sort(keys(%changes))) { |
} |
| if ($item eq 'submitbugs') { |
} |
| $resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>'; |
$resulttext .= '</ul>'; |
| } |
} else { |
| if ($item eq 'loginhelpurl') { |
$resulttext = &mt('No changes made to help settings'); |
| if ($helphash{'helpsettings'}{'loginhelpurl'} eq '') { |
$errors .= '<li><span class="LC_error">'. |
| $resulttext .= '<li>'.&mt('[_1] help file removed; [_2] file will be used for the unathorized help page in this domain.',$customhelpfile,$defaulthelpfile).'</li>'; |
&mt('An error occurred storing the settings: [_1]', |
| } else { |
$putresult).'</span></li>'; |
| $resulttext .= '<li>'.&mt("$title{$item} [_1]",$customhelpfile).'</li>'; |
} |
| } |
|
| } |
|
| } |
|
| $resulttext .= '</ul>'; |
|
| } else { |
|
| $resulttext = &mt('No changes made to help settings'); |
|
| } |
|
| } else { |
|
| $resulttext = '<span class="LC_error">'. |
|
| &mt('An error occurred: [_1]',$putresult).'</span>'; |
|
| } |
} |
| 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 6684 sub modify_coursedefaults {
|
Line 7825 sub modify_coursedefaults {
|
| 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 @offon = ('off','on'); |
| my @toggles = (); |
my @toggles = ('canuse_pdfforms'); |
| |
|
| $defaultshash{'coursedefaults'} = {}; |
$defaultshash{'coursedefaults'} = {}; |
| |
|
|
Line 6761 sub modify_coursedefaults {
|
Line 7902 sub modify_coursedefaults {
|
| |
|
| sub modify_usersessions { |
sub modify_usersessions { |
| my ($dom,%domconfig) = @_; |
my ($dom,%domconfig) = @_; |
| my @types = ('version','excludedomain','includedomain'); |
my @hostingtypes = ('version','excludedomain','includedomain'); |
| my @prefixes = ('remote','hosted'); |
my @offloadtypes = ('primary','default'); |
| |
my %types = ( |
| |
remote => \@hostingtypes, |
| |
hosted => \@hostingtypes, |
| |
spares => \@offloadtypes, |
| |
); |
| |
my @prefixes = ('remote','hosted','spares'); |
| my @lcversions = &Apache::lonnet::all_loncaparevs(); |
my @lcversions = &Apache::lonnet::all_loncaparevs(); |
| my (%by_ip,%by_location,@intdoms); |
my (%by_ip,%by_location,@intdoms); |
| &build_location_hashes(\@intdoms,\%by_ip,\%by_location); |
&build_location_hashes(\@intdoms,\%by_ip,\%by_location); |
|
Line 6775 sub modify_usersessions {
|
Line 7922 sub modify_usersessions {
|
| my $resulttext; |
my $resulttext; |
| my %iphost = &Apache::lonnet::get_iphost(); |
my %iphost = &Apache::lonnet::get_iphost(); |
| foreach my $prefix (@prefixes) { |
foreach my $prefix (@prefixes) { |
| foreach my $type (@types) { |
next if ($prefix eq 'spares'); |
| |
foreach my $type (@{$types{$prefix}}) { |
| my $inuse = $env{'form.'.$prefix.'_'.$type.'_inuse'}; |
my $inuse = $env{'form.'.$prefix.'_'.$type.'_inuse'}; |
| if ($type eq 'version') { |
if ($type eq 'version') { |
| my $value = $env{'form.'.$prefix.'_'.$type}; |
my $value = $env{'form.'.$prefix.'_'.$type}; |
|
Line 6867 sub modify_usersessions {
|
Line 8015 sub modify_usersessions {
|
| } |
} |
| } |
} |
| } |
} |
| if (keys(%changes) > 0) { |
|
| |
my @alldoms = &Apache::lonnet::all_domains(); |
| |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
| |
my %spareid = ¤t_offloads_to($dom,$domconfig{'usersessions'},\%servers); |
| |
my $savespares; |
| |
|
| |
foreach my $lonhost (sort(keys(%servers))) { |
| |
my $serverhomeID = |
| |
&Apache::lonnet::get_server_homeID($servers{$lonhost}); |
| |
my $serverhostname = &Apache::lonnet::hostname($lonhost); |
| |
$defaultshash{'usersessions'}{'spares'}{$lonhost} = {}; |
| |
my %spareschg; |
| |
foreach my $type (@{$types{'spares'}}) { |
| |
my @okspares; |
| |
my @checked = &Apache::loncommon::get_env_multiple('form.spare_'.$type.'_'.$lonhost); |
| |
foreach my $server (@checked) { |
| |
if (&Apache::lonnet::hostname($server) ne '') { |
| |
unless (&Apache::lonnet::hostname($server) eq $serverhostname) { |
| |
unless (grep(/^\Q$server\E$/,@okspares)) { |
| |
push(@okspares,$server); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
my $new = $env{'form.newspare_'.$type.'_'.$lonhost}; |
| |
my $newspare; |
| |
if (($new ne '') && (&Apache::lonnet::hostname($new))) { |
| |
unless (&Apache::lonnet::hostname($new) eq $serverhostname) { |
| |
$newspare = $new; |
| |
} |
| |
} |
| |
my @spares; |
| |
if (($newspare ne '') && (!grep(/^\Q$newspare\E$/,@okspares))) { |
| |
@spares = sort(@okspares,$newspare); |
| |
} else { |
| |
@spares = sort(@okspares); |
| |
} |
| |
$defaultshash{'usersessions'}{'spares'}{$lonhost}{$type} = \@spares; |
| |
if (ref($spareid{$lonhost}) eq 'HASH') { |
| |
if (ref($spareid{$lonhost}{$type}) eq 'ARRAY') { |
| |
my @diffs = &Apache::loncommon::compare_arrays($spareid{$lonhost}{$type},\@spares); |
| |
if (@diffs > 0) { |
| |
$spareschg{$type} = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if (keys(%spareschg) > 0) { |
| |
$changes{'spares'}{$lonhost} = \%spareschg; |
| |
} |
| |
} |
| |
|
| |
if (ref($domconfig{'usersessions'}) eq 'HASH') { |
| |
if (ref($domconfig{'usersessions'}{'spares'}) eq 'HASH') { |
| |
if (ref($changes{'spares'}) eq 'HASH') { |
| |
if (keys(%{$changes{'spares'}}) > 0) { |
| |
$savespares = 1; |
| |
} |
| |
} |
| |
} else { |
| |
$savespares = 1; |
| |
} |
| |
} |
| |
|
| |
my $nochgmsg = &mt('No changes made to settings for user session hosting/offloading.'); |
| |
if ((keys(%changes) > 0) || ($savespares)) { |
| 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') { |
|
Line 6881 sub modify_usersessions {
|
Line 8094 sub modify_usersessions {
|
| } |
} |
| my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
| &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
| my %lt = &usersession_titles(); |
if (keys(%changes) > 0) { |
| $resulttext = &mt('Changes made:').'<ul>'; |
my %lt = &usersession_titles(); |
| foreach my $prefix (@prefixes) { |
$resulttext = &mt('Changes made:').'<ul>'; |
| if (ref($changes{$prefix}) eq 'HASH') { |
foreach my $prefix (@prefixes) { |
| $resulttext .= '<li>'.$lt{$prefix}.'<ul>'; |
if (ref($changes{$prefix}) eq 'HASH') { |
| foreach my $type (@types) { |
$resulttext .= '<li>'.$lt{$prefix}.'<ul>'; |
| if (defined($changes{$prefix}{$type})) { |
if ($prefix eq 'spares') { |
| my $newvalue; |
if (ref($changes{$prefix}) eq 'HASH') { |
| if (ref($defaultshash{'usersessions'}) eq 'HASH') { |
foreach my $lonhost (sort(keys(%{$changes{$prefix}}))) { |
| if (ref($defaultshash{'usersessions'}{$prefix})) { |
$resulttext .= '<li><b>'.$lonhost.'</b> '; |
| if ($type eq 'version') { |
my $lonhostdom = &Apache::lonnet::host_domain($lonhost); |
| $newvalue = $defaultshash{'usersessions'}{$prefix}{$type}; |
&Apache::lonnet::remote_devalidate_cache($lonhost,'spares',$lonhostdom); |
| } elsif (ref($defaultshash{'usersessions'}{$prefix}{$type}) eq 'ARRAY') { |
if (ref($changes{$prefix}{$lonhost}) eq 'HASH') { |
| if (@{$defaultshash{'usersessions'}{$prefix}{$type}} > 0) { |
foreach my $type (@{$types{$prefix}}) { |
| $newvalue = join(', ',@{$defaultshash{'usersessions'}{$prefix}{$type}}); |
if ($changes{$prefix}{$lonhost}{$type}) { |
| |
my $offloadto = &mt('None'); |
| |
if (ref($defaultshash{'usersessions'}{'spares'}{$lonhost}{$type}) eq 'ARRAY') { |
| |
if (@{$defaultshash{'usersessions'}{'spares'}{$lonhost}{$type}} > 0) { |
| |
$offloadto = join(', ',@{$defaultshash{'usersessions'}{'spares'}{$lonhost}{$type}}); |
| |
} |
| |
} |
| |
$resulttext .= &mt('[_1] set to: [_2].','<i>'.$lt{$type}.'</i>',$offloadto).(' 'x3); |
| |
} |
| |
} |
| |
} |
| |
$resulttext .= '</li>'; |
| |
} |
| |
} |
| |
} else { |
| |
foreach my $type (@{$types{$prefix}}) { |
| |
if (defined($changes{$prefix}{$type})) { |
| |
my $newvalue; |
| |
if (ref($defaultshash{'usersessions'}) eq 'HASH') { |
| |
if (ref($defaultshash{'usersessions'}{$prefix})) { |
| |
if ($type eq 'version') { |
| |
$newvalue = $defaultshash{'usersessions'}{$prefix}{$type}; |
| |
} elsif (ref($defaultshash{'usersessions'}{$prefix}{$type}) eq 'ARRAY') { |
| |
if (@{$defaultshash{'usersessions'}{$prefix}{$type}} > 0) { |
| |
$newvalue = join(', ',@{$defaultshash{'usersessions'}{$prefix}{$type}}); |
| |
} |
| |
} |
| } |
} |
| } |
} |
| |
if ($newvalue eq '') { |
| |
if ($type eq 'version') { |
| |
$resulttext .= '<li>'.&mt('[_1] set to: off',$lt{$type}).'</li>'; |
| |
} else { |
| |
$resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>'; |
| |
} |
| |
} else { |
| |
if ($type eq 'version') { |
| |
$newvalue .= ' '.&mt('(or later)'); |
| |
} |
| |
$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>'; |
| |
} |
| } |
} |
| } |
} |
| if ($newvalue eq '') { |
} |
| if ($type eq 'version') { |
$resulttext .= '</ul>'; |
| $resulttext .= '<li>'.&mt('[_1] set to: off',$lt{$type}).'</li>'; |
} |
| |
} |
| |
$resulttext .= '</ul>'; |
| |
} else { |
| |
$resulttext = $nochgmsg; |
| |
} |
| |
} else { |
| |
$resulttext = '<span class="LC_error">'. |
| |
&mt('An error occurred: [_1]',$putresult).'</span>'; |
| |
} |
| |
} else { |
| |
$resulttext = $nochgmsg; |
| |
} |
| |
return $resulttext; |
| |
} |
| |
|
| |
sub modify_loadbalancing { |
| |
my ($dom,%domconfig) = @_; |
| |
my $primary_id = &Apache::lonnet::domain($dom,'primary'); |
| |
my $intdom = &Apache::lonnet::internet_dom($primary_id); |
| |
my ($othertitle,$usertypes,$types) = |
| |
&Apache::loncommon::sorted_inst_types($dom); |
| |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
| |
my @sparestypes = ('primary','default'); |
| |
my %typetitles = &sparestype_titles(); |
| |
my $resulttext; |
| |
my (%currbalancer,%currtargets,%currrules,%existing); |
| |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
| |
%existing = %{$domconfig{'loadbalancing'}}; |
| |
} |
| |
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer, |
| |
\%currtargets,\%currrules); |
| |
my ($saveloadbalancing,%defaultshash,%changes); |
| |
my ($alltypes,$othertypes,$titles) = |
| |
&loadbalancing_titles($dom,$intdom,$usertypes,$types); |
| |
my %ruletitles = &offloadtype_text(); |
| |
my @deletions = &Apache::loncommon::get_env_multiple('form.loadbalancing_delete'); |
| |
for (my $i=0; $i<$env{'form.loadbalancing_total'}; $i++) { |
| |
my $balancer = $env{'form.loadbalancing_lonhost_'.$i}; |
| |
if ($balancer eq '') { |
| |
next; |
| |
} |
| |
if (!exists($servers{$balancer})) { |
| |
if (exists($currbalancer{$balancer})) { |
| |
push(@{$changes{'delete'}},$balancer); |
| |
} |
| |
next; |
| |
} |
| |
if ((@deletions > 0) && (grep(/^\Q$i\E$/,@deletions))) { |
| |
push(@{$changes{'delete'}},$balancer); |
| |
next; |
| |
} |
| |
if (!exists($currbalancer{$balancer})) { |
| |
push(@{$changes{'add'}},$balancer); |
| |
} |
| |
$defaultshash{'loadbalancing'}{$balancer}{'targets'}{'primary'} = []; |
| |
$defaultshash{'loadbalancing'}{$balancer}{'targets'}{'default'} = []; |
| |
$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'}})); |
| |
} |
| |
} |
| |
unless(grep(/^\Q$target\E$/,@offloadto)) { |
| |
push(@offloadto,$target); |
| |
} |
| |
} |
| |
$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto; |
| |
} |
| |
} |
| |
if (ref($currtargets{$balancer}) eq 'HASH') { |
| |
foreach my $sparetype (@sparestypes) { |
| |
if (ref($currtargets{$balancer}{$sparetype}) eq 'ARRAY') { |
| |
my @targetdiffs = &Apache::loncommon::compare_arrays($currtargets{$balancer}{$sparetype},$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}); |
| |
if (@targetdiffs > 0) { |
| |
$changes{'curr'}{$balancer}{'targets'} = 1; |
| |
} |
| |
} elsif (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') { |
| |
if (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}} > 0) { |
| |
$changes{'curr'}{$balancer}{'targets'} = 1; |
| |
} |
| |
} |
| |
} |
| |
} else { |
| |
if (ref($defaultshash{'loadbalancing'}{$balancer}) eq 'HASH') { |
| |
foreach my $sparetype (@sparestypes) { |
| |
if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') { |
| |
if (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}} > 0) { |
| |
$changes{'curr'}{$balancer}{'targets'} = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
my $ishomedom; |
| |
if (&Apache::lonnet::host_domain($balancer) eq $dom) { |
| |
$ishomedom = 1; |
| |
} |
| |
if (ref($alltypes) eq 'ARRAY') { |
| |
foreach my $type (@{$alltypes}) { |
| |
my $rule; |
| |
unless ((($type eq '_LC_external') || ($type eq '_LC_internetdom')) && |
| |
(!$ishomedom)) { |
| |
$rule = $env{'form.loadbalancing_rules_'.$i.'_'.$type}; |
| |
} |
| |
if ($rule eq 'specific') { |
| |
$rule = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type}; |
| |
} |
| |
$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type} = $rule; |
| |
if (ref($currrules{$balancer}) eq 'HASH') { |
| |
if ($rule ne $currrules{$balancer}{$type}) { |
| |
$changes{'curr'}{$balancer}{'rules'}{$type} = 1; |
| |
} |
| |
} elsif ($rule ne '') { |
| |
$changes{'curr'}{$balancer}{'rules'}{$type} = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
my $nochgmsg = &mt('No changes made to Load Balancer settings.'); |
| |
if ((keys(%changes) > 0) || ($saveloadbalancing)) { |
| |
unless (ref($defaultshash{'loadbalancing'}) eq 'HASH') { |
| |
$defaultshash{'loadbalancing'} = {}; |
| |
} |
| |
my $putresult = &Apache::lonnet::put_dom('configuration', |
| |
\%defaultshash,$dom); |
| |
|
| |
if ($putresult eq 'ok') { |
| |
if (keys(%changes) > 0) { |
| |
if (ref($changes{'delete'}) eq 'ARRAY') { |
| |
foreach my $balancer (sort(@{$changes{'delete'}})) { |
| |
$resulttext .= '<li>'.&mt('Load Balancing discontinued for: [_1]',$balancer).'</li>'; |
| |
&Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom); |
| |
} |
| |
} |
| |
if (ref($changes{'add'}) eq 'ARRAY') { |
| |
foreach my $balancer (sort(@{$changes{'add'}})) { |
| |
$resulttext .= '<li>'.&mt('Load Balancing enabled for: [_1]',$balancer); |
| |
} |
| |
} |
| |
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>'; |
| } else { |
} else { |
| $resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>'; |
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>'; |
| |
} |
| |
} |
| |
} |
| |
if (ref($changes{'curr'}{$balancer}{'rules'}) eq 'HASH') { |
| |
if ((ref($alltypes) eq 'ARRAY') && (ref($titles) eq 'HASH')) { |
| |
foreach my $type (@{$alltypes}) { |
| |
if ($changes{'curr'}{$balancer}{'rules'}{$type}) { |
| |
my $rule = $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type}; |
| |
my $balancetext; |
| |
if ($rule eq '') { |
| |
$balancetext = $ruletitles{'default'}; |
| |
} elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer')) { |
| |
$balancetext = $ruletitles{$rule}; |
| |
} else { |
| |
$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>'; |
| |
} |
| } |
} |
| } else { |
|
| if ($type eq 'version') { |
|
| $newvalue .= ' '.&mt('(or later)'); |
|
| } |
|
| $resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>'; |
|
| } |
} |
| } |
} |
| |
&Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom); |
| } |
} |
| $resulttext .= '</ul>'; |
|
| } |
} |
| |
if ($resulttext ne '') { |
| |
$resulttext = &mt('Changes made:').'<ul>'.$resulttext.'</ul>'; |
| |
} else { |
| |
$resulttext = $nochgmsg; |
| |
} |
| |
} else { |
| |
$resulttext = $nochgmsg; |
| } |
} |
| $resulttext .= '</ul>'; |
|
| } else { |
} else { |
| $resulttext = '<span class="LC_error">'. |
$resulttext = '<span class="LC_error">'. |
| &mt('An error occurred: [_1]',$putresult).'</span>'; |
&mt('An error occurred: [_1]',$putresult).'</span>'; |
| } |
} |
| } else { |
} else { |
| $resulttext = &mt('No changes made to settings for user session hosting.'); |
$resulttext = $nochgmsg; |
| } |
} |
| return $resulttext; |
return $resulttext; |
| } |
} |
|
Line 6962 sub recurse_cat_deletes {
|
Line 8403 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; |
|
| } |
|
| |
|
| sub dom_servers { |
|
| my ($dom) = @_; |
|
| my (%uniqservers,%servers); |
|
| my $primaryserver = &Apache::lonnet::hostname(&Apache::lonnet::domain($dom,'primary')); |
|
| my @machinedoms = &Apache::lonnet::machine_domains($primaryserver); |
|
| foreach my $mdom (@machinedoms) { |
|
| my %currservers = %servers; |
|
| my %server = &Apache::lonnet::get_servers($mdom); |
|
| %servers = (%currservers,%server); |
|
| } |
|
| my %by_hostname; |
|
| foreach my $id (keys(%servers)) { |
|
| push(@{$by_hostname{$servers{$id}}},$id); |
|
| } |
|
| foreach my $hostname (sort(keys(%by_hostname))) { |
|
| if (@{$by_hostname{$hostname}} > 1) { |
|
| my $match = 0; |
|
| foreach my $id (@{$by_hostname{$hostname}}) { |
|
| if (&Apache::lonnet::host_domain($id) eq $dom) { |
|
| $uniqservers{$id} = $hostname; |
|
| $match = 1; |
|
| } |
|
| } |
|
| unless ($match) { |
|
| $uniqservers{$by_hostname{$hostname}[0]} = $hostname; |
|
| } |
} |
| } else { |
|
| $uniqservers{$by_hostname{$hostname}[0]} = $hostname; |
|
| } |
} |
| } |
} |
| return %uniqservers; |
return; |
| } |
} |
| |
|
| sub get_active_dcs { |
sub get_active_dcs { |
|
Line 7061 sub active_dc_picker {
|
Line 8469 sub active_dc_picker {
|
| '<input type="radio" name="autocreate_xmldc"'. |
'<input type="radio" name="autocreate_xmldc"'. |
| ' value="'.$dcs[$i].'"'.$check.'/>'. |
' value="'.$dcs[$i].'"'.$check.'/>'. |
| &Apache::loncommon::plainname($dcname,$dcdom). |
&Apache::loncommon::plainname($dcname,$dcdom). |
| |
' ('.$dcname.':'.$dcdom.')'. |
| '</label></span></td>'; |
'</label></span></td>'; |
| } |
} |
| $datatable .= '</tr></table>'; |
$datatable .= '</tr></table>'; |
|
Line 7074 sub active_dc_picker {
|
Line 8483 sub active_dc_picker {
|
| sub usersession_titles { |
sub usersession_titles { |
| return &Apache::lonlocal::texthash( |
return &Apache::lonlocal::texthash( |
| hosted => 'Hosting of sessions for users from other domains on servers in this domain', |
hosted => 'Hosting of sessions for users from other domains on servers in this domain', |
| |
|
| remote => 'Hosting of sessions for users in this domain on servers in other domains', |
remote => 'Hosting of sessions for users in this domain on servers in other domains', |
| |
spares => 'Servers offloaded to, when busy', |
| version => 'LON-CAPA version requirement', |
version => 'LON-CAPA version requirement', |
| excludedomain => 'Allow all, but exclude specific domains', |
excludedomain => 'Allow all, but exclude specific domains', |
| includedomain => 'Deny all, but include specific domains', |
includedomain => 'Deny all, but include specific domains', |
| |
primary => 'Primary (checked first)', |
| |
default => 'Default', |
| ); |
); |
| } |
} |
| |
|
| |
sub id_for_thisdom { |
| |
my (%servers) = @_; |
| |
my %altids; |
| |
foreach my $server (keys(%servers)) { |
| |
my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server}); |
| |
if ($serverhome ne $server) { |
| |
$altids{$serverhome} = $server; |
| |
} |
| |
} |
| |
return %altids; |
| |
} |
| |
|
| |
sub count_servers { |
| |
my ($currbalancer,%servers) = @_; |
| |
my (@spares,$numspares); |
| |
foreach my $lonhost (sort(keys(%servers))) { |
| |
next if ($currbalancer eq $lonhost); |
| |
push(@spares,$lonhost); |
| |
} |
| |
if ($currbalancer) { |
| |
$numspares = scalar(@spares); |
| |
} else { |
| |
$numspares = scalar(@spares) - 1; |
| |
} |
| |
return ($numspares,@spares); |
| |
} |
| |
|
| |
sub lonbalance_targets_js { |
| |
my ($dom,$types,$servers,$settings) = @_; |
| |
my $select = &mt('Select'); |
| |
my ($alltargets,$allishome,$allinsttypes,@alltypes); |
| |
if (ref($servers) eq 'HASH') { |
| |
$alltargets = join("','",sort(keys(%{$servers}))); |
| |
my @homedoms; |
| |
foreach my $server (sort(keys(%{$servers}))) { |
| |
if (&Apache::lonnet::host_domain($server) eq $dom) { |
| |
push(@homedoms,'1'); |
| |
} else { |
| |
push(@homedoms,'0'); |
| |
} |
| |
} |
| |
$allishome = join("','",@homedoms); |
| |
} |
| |
if (ref($types) eq 'ARRAY') { |
| |
if (@{$types} > 0) { |
| |
@alltypes = @{$types}; |
| |
} |
| |
} |
| |
push(@alltypes,'default','_LC_adv','_LC_author','_LC_internetdom','_LC_external'); |
| |
$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"; |
| |
|
| |
<script type="text/javascript"> |
| |
// <![CDATA[ |
| |
|
| |
currBalancers = new Array('$balancers'); |
| |
|
| |
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 == '') { |
| |
hideSpares(balnum); |
| |
} else { |
| |
var currIdx = currBalancers.indexOf(balancer); |
| |
if (currIdx == -1) { |
| |
currBalancers.push(balancer); |
| |
} |
| |
var homedoms = new Array('$allishome'); |
| |
var ishomedom = homedoms[lonhostitem.selectedIndex]; |
| |
showSpares(balancer,ishomedom,balnum); |
| |
} |
| |
balancerChange(balnum,baltotal,'change',prevbalancer,balancer); |
| |
return; |
| |
} |
| |
|
| |
function showSpares(balancer,ishomedom,balnum) { |
| |
var alltargets = new Array('$alltargets'); |
| |
var insttypes = new Array('$allinsttypes'); |
| |
var offloadtypes = new Array('primary','default'); |
| |
|
| |
document.getElementById('loadbalancing_targets_'+balnum).style.display='block'; |
| |
document.getElementById('loadbalancing_disabled_'+balnum).style.display='none'; |
| |
|
| |
for (var i=0; i<offloadtypes.length; i++) { |
| |
var count = 0; |
| |
for (var j=0; j<alltargets.length; j++) { |
| |
if (alltargets[j] != balancer) { |
| |
var item = document.getElementById('loadbalancing_target_'+balnum+'_'+offloadtypes[i]+'_'+count); |
| |
item.value = alltargets[j]; |
| |
item.style.textAlign='left'; |
| |
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 ++; |
| |
} |
| |
} |
| |
} |
| |
for (var k=0; k<insttypes.length; k++) { |
| |
if ((insttypes[k] == '_LC_external') || (insttypes[k] == '_LC_internetdom')) { |
| |
if (ishomedom == 1) { |
| |
document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='block'; |
| |
document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='block'; |
| |
} else { |
| |
document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='none'; |
| |
document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='none'; |
| |
|
| |
} |
| |
} else { |
| |
document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='block'; |
| |
document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='block'; |
| |
} |
| |
if ((insttypes[k] != '_LC_external') && |
| |
((insttypes[k] != '_LC_internetdom') || |
| |
((insttypes[k] == '_LC_internetdom') && (ishomedom == 1)))) { |
| |
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++) { |
| |
if ((currBalancers.indexOf(alltargets[m]) == -1) && (alltargets[m] != balancer)) { |
| |
idx ++; |
| |
item.options[idx] = new Option(alltargets[m],alltargets[m],false,false); |
| |
|
| |
} |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
function hideSpares(balnum) { |
| |
var alltargets = new Array('$alltargets'); |
| |
var insttypes = new Array('$allinsttypes'); |
| |
var offloadtypes = new Array('primary','default'); |
| |
|
| |
document.getElementById('loadbalancing_targets_'+balnum).style.display='none'; |
| |
document.getElementById('loadbalancing_disabled_'+balnum).style.display='block'; |
| |
|
| |
var total = alltargets.length - 1; |
| |
for (var i=0; i<offloadtypes; i++) { |
| |
for (var j=0; j<total; j++) { |
| |
document.getElementById('loadbalancing_target_'+balnum+'_'+offloadtypes[i]+'_'+j).checked = false; |
| |
document.getElementById('loadbalancing_target_'+balnum+'_'+offloadtypes[i]+'_'+j).value = ''; |
| |
document.getElementById('loadbalancing_targettxt_'+balnum+'_'+offloadtypes[i]+'_'+j).innerHTML = ''; |
| |
} |
| |
} |
| |
for (var k=0; k<insttypes.length; k++) { |
| |
document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='none'; |
| |
document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='none'; |
| |
if (insttypes[k] != '_LC_external') { |
| |
document.getElementById('loadbalancing_singleserver_'+balnum+'_'+insttypes[k]).length = 0; |
| |
document.getElementById('loadbalancing_singleserver_'+balnum+'_'+insttypes[k]).options[0] = new Option("","",true,true); |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
function checkOffloads(item,balnum,type) { |
| |
var alltargets = new Array('$alltargets'); |
| |
var offloadtypes = new Array('primary','default'); |
| |
if (item.checked) { |
| |
var total = alltargets.length - 1; |
| |
var other; |
| |
if (type == offloadtypes[0]) { |
| |
other = offloadtypes[1]; |
| |
} else { |
| |
other = offloadtypes[0]; |
| |
} |
| |
for (var i=0; i<total; i++) { |
| |
var server = document.getElementById('loadbalancing_target_'+balnum+'_'+other+'_'+i).value; |
| |
if (server == item.value) { |
| |
if (document.getElementById('loadbalancing_target_'+balnum+'_'+other+'_'+i).checked) { |
| |
document.getElementById('loadbalancing_target_'+balnum+'_'+other+'_'+i).checked = false; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
function singleServerToggle(balnum,type) { |
| |
var offloadtoSelIdx = document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).selectedIndex; |
| |
if (offloadtoSelIdx == 0) { |
| |
document.getElementById('loadbalancing_rules_'+balnum+'_'+type+'_0').checked = true; |
| |
document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).options[0].text = ''; |
| |
|
| |
} else { |
| |
document.getElementById('loadbalancing_rules_'+balnum+'_'+type+'_2').checked = true; |
| |
document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).options[0].text = '$select'; |
| |
} |
| |
return; |
| |
} |
| |
|
| |
function balanceruleChange(formname,balnum,type) { |
| |
if (type == '_LC_external') { |
| |
return; |
| |
} |
| |
var typesRules = getIndicesByName(formname,'loadbalancing_rules_'+balnum+'_'+type); |
| |
for (var i=0; i<typesRules.length; i++) { |
| |
if (formname.elements[typesRules[i]].checked) { |
| |
if (formname.elements[typesRules[i]].value != 'specific') { |
| |
document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).selectedIndex = 0; |
| |
document.getElementById('loadbalancing_singleserver_'+balnum+'_'+type).options[0].text = ''; |
| |
} else { |
| |
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); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
// ]]> |
| |
</script> |
| |
|
| |
END |
| |
} |
| |
|
| |
sub new_spares_js { |
| |
my @sparestypes = ('primary','default'); |
| |
my $types = join("','",@sparestypes); |
| |
my $select = &mt('Select'); |
| |
return <<"END"; |
| |
|
| |
<script type="text/javascript"> |
| |
// <![CDATA[ |
| |
|
| |
function updateNewSpares(formname,lonhost) { |
| |
var types = new Array('$types'); |
| |
var include = new Array(); |
| |
var exclude = new Array(); |
| |
for (var i=0; i<types.length; i++) { |
| |
var spareboxes = getIndicesByName(formname,'spare_'+types[i]+'_'+lonhost); |
| |
for (var j=0; j<spareboxes.length; j++) { |
| |
if (formname.elements[spareboxes[j]].checked) { |
| |
exclude.push(formname.elements[spareboxes[j]].value); |
| |
} else { |
| |
include.push(formname.elements[spareboxes[j]].value); |
| |
} |
| |
} |
| |
} |
| |
for (var i=0; i<types.length; i++) { |
| |
var newSpare = document.getElementById('newspare_'+types[i]+'_'+lonhost); |
| |
var selIdx = newSpare.selectedIndex; |
| |
var currnew = newSpare.options[selIdx].value; |
| |
var okSpares = new Array(); |
| |
for (var j=0; j<newSpare.options.length; j++) { |
| |
var possible = newSpare.options[j].value; |
| |
if (possible != '') { |
| |
if (exclude.indexOf(possible) == -1) { |
| |
okSpares.push(possible); |
| |
} else { |
| |
if (currnew == possible) { |
| |
selIdx = 0; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
for (var k=0; k<include.length; k++) { |
| |
if (okSpares.indexOf(include[k]) == -1) { |
| |
okSpares.push(include[k]); |
| |
} |
| |
} |
| |
okSpares.sort(); |
| |
newSpare.options.length = 0; |
| |
if (selIdx == 0) { |
| |
newSpare.options[0] = new Option("$select","",true,true); |
| |
} else { |
| |
newSpare.options[0] = new Option("$select","",false,false); |
| |
} |
| |
for (var m=0; m<okSpares.length; m++) { |
| |
var idx = m+1; |
| |
var selThis = 0; |
| |
if (selIdx != 0) { |
| |
if (okSpares[m] == currnew) { |
| |
selThis = 1; |
| |
} |
| |
} |
| |
if (selThis == 1) { |
| |
newSpare.options[idx] = new Option(okSpares[m],okSpares[m],true,true); |
| |
} else { |
| |
newSpare.options[idx] = new Option(okSpares[m],okSpares[m],false,false); |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
function checkNewSpares(lonhost,type) { |
| |
var newSpare = document.getElementById('newspare_'+type+'_'+lonhost); |
| |
var chosen = newSpare.options[newSpare.selectedIndex].value; |
| |
if (chosen != '') { |
| |
var othertype; |
| |
var othernewSpare; |
| |
if (type == 'primary') { |
| |
othernewSpare = document.getElementById('newspare_default_'+lonhost); |
| |
} |
| |
if (type == 'default') { |
| |
othernewSpare = document.getElementById('newspare_primary_'+lonhost); |
| |
} |
| |
if (othernewSpare.options[othernewSpare.selectedIndex].value == chosen) { |
| |
othernewSpare.selectedIndex = 0; |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
// ]]> |
| |
</script> |
| |
|
| |
END |
| |
|
| |
} |
| |
|
| |
sub common_domprefs_js { |
| |
return <<"END"; |
| |
|
| |
<script type="text/javascript"> |
| |
// <![CDATA[ |
| |
|
| |
function getIndicesByName(formname,item) { |
| |
var group = new Array(); |
| |
for (var i=0;i<formname.elements.length;i++) { |
| |
if (formname.elements[i].name == item) { |
| |
group.push(formname.elements[i].id); |
| |
} |
| |
} |
| |
return group; |
| |
} |
| |
|
| |
// ]]> |
| |
</script> |
| |
|
| |
END |
| |
|
| |
} |
| |
|
| |
sub recaptcha_js { |
| |
my %lt = &captcha_phrases(); |
| |
return <<"END"; |
| |
|
| |
<script type="text/javascript"> |
| |
// <![CDATA[ |
| |
|
| |
function updateCaptcha(caller,context) { |
| |
var privitem; |
| |
var pubitem; |
| |
var privtext; |
| |
var pubtext; |
| |
if (document.getElementById(context+'_recaptchapub')) { |
| |
pubitem = document.getElementById(context+'_recaptchapub'); |
| |
} else { |
| |
return; |
| |
} |
| |
if (document.getElementById(context+'_recaptchapriv')) { |
| |
privitem = document.getElementById(context+'_recaptchapriv'); |
| |
} else { |
| |
return; |
| |
} |
| |
if (document.getElementById(context+'_recaptchapubtxt')) { |
| |
pubtext = document.getElementById(context+'_recaptchapubtxt'); |
| |
} else { |
| |
return; |
| |
} |
| |
if (document.getElementById(context+'_recaptchaprivtxt')) { |
| |
privtext = document.getElementById(context+'_recaptchaprivtxt'); |
| |
} else { |
| |
return; |
| |
} |
| |
if (caller.checked) { |
| |
if (caller.value == 'recaptcha') { |
| |
pubitem.type = 'text'; |
| |
privitem.type = 'text'; |
| |
pubitem.size = '40'; |
| |
privitem.size = '40'; |
| |
pubtext.innerHTML = "$lt{'pub'}"; |
| |
privtext.innerHTML = "$lt{'priv'}"; |
| |
} else { |
| |
pubitem.type = 'hidden'; |
| |
privitem.type = 'hidden'; |
| |
pubtext.innerHTML = ''; |
| |
privtext.innerHTML = ''; |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
// ]]> |
| |
</script> |
| |
|
| |
END |
| |
|
| |
} |
| |
|
| |
sub captcha_phrases { |
| |
return &Apache::lonlocal::texthash ( |
| |
priv => 'Private key', |
| |
pub => 'Public key', |
| |
original => 'original (CAPTCHA)', |
| |
recaptcha => 'successor (ReCAPTCHA)', |
| |
notused => 'unused', |
| |
); |
| |
} |
| |
|
| 1; |
1; |
![[BACK]](/icons/back.gif){kind=icon}
Return to domainprefs.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / interface