';
- $itemcount ++;
- }
- if (ref($rowtotal)) {
- $$rowtotal += $itemcount;
}
+ $$rowtotal += $itemcount;
return $datatable;
}
@@ -4031,13 +3033,7 @@ sub print_usersessions {
if ($position eq 'top') {
if (keys(%serverhomes) > 1) {
my %spareid = ¤t_offloads_to($dom,$settings,\%servers);
- my $curroffloadnow;
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{'offloadnow'}) eq 'HASH') {
- $curroffloadnow = $settings->{'offloadnow'};
- }
- }
- $datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$curroffloadnow,$rowtotal);
+ $datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$rowtotal);
} else {
$datatable .= '
'.
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.');
@@ -4287,7 +3283,7 @@ sub current_offloads_to {
}
sub spares_row {
- my ($dom,$servers,$spareid,$serverhomes,$altids,$curroffloadnow,$rowtotal) = @_;
+ my ($dom,$servers,$spareid,$serverhomes,$altids,$rowtotal) = @_;
my $css_class;
my $numinrow = 4;
my $itemcount = 1;
@@ -4307,21 +3303,12 @@ sub spares_row {
}
}
next unless (ref($spareid->{$server}) eq 'HASH');
- my $checkednow;
- if (ref($curroffloadnow) eq 'HASH') {
- if ($curroffloadnow->{$server}) {
- $checkednow = ' checked="checked"';
- }
- }
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
$datatable .= '
'.
&mt('[_1] when busy, offloads to:'
- ,''.$server.'').' '.
- ''."\n".
- ''.
+ ,''.$server.'').
"\n";
my (%current,%canselect);
my @choices =
@@ -4446,13 +3433,13 @@ sub print_loadbalancing {
my $numinrow = 1;
my $datatable;
my %servers = &Apache::lonnet::internet_dom_servers($dom);
- my (%currbalancer,%currtargets,%currrules,%existing,%currcookies);
+ 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,\%currcookies);
+ \%currtargets,\%currrules);
} else {
return;
}
@@ -4526,12 +3513,6 @@ sub print_loadbalancing {
my ($numspares,@spares) = &count_servers($lonhost,%servers);
my @sparestypes = ('primary','default');
my %typetitles = &sparestype_titles();
- my %hostherechecked = (
- no => ' checked="checked"',
- );
- my %balcookiechecked = (
- no => ' checked="checked"',
- );
foreach my $sparetype (@sparestypes) {
my $targettable;
for (my $i=0; $i<$numspares; $i++) {
@@ -4551,10 +3532,9 @@ sub print_loadbalancing {
$disabled = ' disabled="disabled"';
}
$targettable .=
- '
';
+ '
';
my $rem = $i%($numinrow);
if ($rem == 0) {
if (($i > 0) && ($i < $numspares-1)) {
@@ -4577,35 +3557,8 @@ sub print_loadbalancing {
$datatable .= ''.$typetitles{$sparetype}.' '.
'
'.$targettable.'
';
}
- $hostherechecked{$sparetype} = '';
- if (ref($currtargets{$lonhost}) eq 'HASH') {
- if (ref($currtargets{$lonhost}{$sparetype}) eq 'ARRAY') {
- if (grep(/^\Q$lonhost\E$/,@{$currtargets{$lonhost}{$sparetype}})) {
- $hostherechecked{$sparetype} = ' checked="checked"';
- $hostherechecked{'no'} = '';
- }
- }
- }
- }
- if ($currcookies{$lonhost}) {
- %balcookiechecked = (
- yes => ' checked="checked"',
- );
}
- $datatable .= &mt('Hosting on balancer itself').' '.
- ' ';
- foreach my $sparetype (@sparestypes) {
- $datatable .= ' ';
- }
- $datatable .= &mt('Use balancer cookie').' '.
- ' '.
- ' '.
- ''.
+ $datatable .= ''.
&loadbalancing_rules($dom,$intdom,$currrules{$lonhost},
$othertitle,$usertypes,$types,\%servers,
\%currbalancer,$lonhost,
@@ -4619,11 +3572,10 @@ sub print_loadbalancing {
}
sub get_loadbalancers_config {
- my ($servers,$existing,$currbalancer,$currtargets,$currrules,$currcookies) = @_;
+ 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') &&
- (ref($currcookies) eq 'HASH'));
+ (ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH'));
if (keys(%{$existing}) > 0) {
my $oldlonhost;
foreach my $key (sort(keys(%{$existing}))) {
@@ -4642,9 +3594,6 @@ sub get_loadbalancers_config {
$currbalancer->{$key} = 1;
$currtargets->{$key} = $existing->{$key}{'targets'};
$currrules->{$key} = $existing->{$key}{'rules'};
- if ($existing->{$key}{'cookie'}) {
- $currcookies->{$key} = 1;
- }
}
}
} else {
@@ -4675,7 +3624,7 @@ sub loadbalancing_rules {
if (ref($currrules) eq 'HASH') {
$current = $currrules->{$type};
}
- if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) {
+ if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) {
if ($dom ne &Apache::lonnet::host_domain($lonhost)) {
$current = '';
}
@@ -4700,14 +3649,9 @@ sub loadbalancing_titles {
'_LC_ipchange' => &mt('Non-SSO users with IP mismatch'),
);
my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external','_LC_ipchangesso','_LC_ipchange');
- my @available;
if (ref($types) eq 'ARRAY') {
- @available = @{$types};
- }
- unless (grep(/^default$/,@available)) {
- push(@available,'default');
+ unshift(@alltypes,@{$types},'default');
}
- unshift(@alltypes,@available);
my %titles;
foreach my $type (@alltypes) {
if ($type =~ /^_LC_/) {
@@ -4732,7 +3676,7 @@ sub loadbalance_rule_row {
my @rulenames;
my %ruletitles = &offloadtype_text();
if (($type eq '_LC_ipchangesso') || ($type eq '_LC_ipchange')) {
- @rulenames = ('balancer','offloadedto','specific');
+ @rulenames = ('balancer','offloadedto');
} else {
@rulenames = ('default','homeserver');
if ($type eq '_LC_external') {
@@ -4743,7 +3687,7 @@ sub loadbalance_rule_row {
push(@rulenames,'none');
}
my $style = $targets_div_style;
- if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) {
+ if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) {
$style = $homedom_div_style;
}
my $space;
@@ -4794,13 +3738,8 @@ sub loadbalance_rule_row {
' ';
- if (($rulenames[$i] eq 'specific') && ($type =~ /^_LC_ipchange/)) {
- $output .= $ruletitles{'particular'};
- } else {
- $output .= $ruletitles{$rulenames[$i]};
- }
- $output .= ''.$extra.' '."\n";
+ ')"'.$checked.' /> '.$ruletitles{$rulenames[$i]}.
+ ''.$extra.' '."\n";
}
$output .= ''."\n";
return $output;
@@ -4815,7 +3754,6 @@ sub offloadtype_text {
'none' => 'No offload',
'balancer' => 'Session hosted on Load Balancer, after re-authentication',
'offloadedto' => 'Session hosted on offload server, after re-authentication',
- 'particular' => 'Session hosted (after re-auth) on server:',
);
return %ruletitles;
}
@@ -4830,17 +3768,15 @@ sub sparestype_titles {
sub contact_titles {
my %titles = &Apache::lonlocal::texthash (
- 'supportemail' => 'Support E-mail address',
- 'adminemail' => 'Default Server Admin E-mail address',
- 'errormail' => 'Error reports to be e-mailed to',
- 'packagesmail' => 'Package update alerts to be e-mailed to',
- 'helpdeskmail' => "Helpdesk requests for this domain's users",
- 'otherdomsmail' => 'Helpdesk requests for other (unconfigured) domains',
- 'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)',
- 'requestsmail' => 'E-mail from course requests requiring approval',
- 'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates',
+ 'supportemail' => 'Support E-mail address',
+ 'adminemail' => 'Default Server Admin E-mail address',
+ 'errormail' => 'Error reports to be e-mailed to',
+ 'packagesmail' => 'Package update alerts to be e-mailed to',
+ 'helpdeskmail' => 'Helpdesk requests to be e-mailed to',
+ 'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)',
+ 'requestsmail' => 'E-mail from course requests requiring approval',
+ 'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates',
'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID',
- 'hostipmail' => 'E-mail from nightly check of hostname/IP network changes',
);
my %short_titles = &Apache::lonlocal::texthash (
adminemail => 'Admin E-mail address',
@@ -4849,34 +3785,6 @@ sub contact_titles {
return (\%titles,\%short_titles);
}
-sub helpform_fields {
- my %titles = &Apache::lonlocal::texthash (
- 'username' => 'Name',
- 'user' => 'Username/domain',
- 'phone' => 'Phone',
- 'cc' => 'Cc e-mail',
- 'course' => 'Course Details',
- 'section' => 'Sections',
- 'screenshot' => 'File upload',
- );
- my @fields = ('username','phone','user','course','section','cc','screenshot');
- my %possoptions = (
- username => ['yes','no','req'],
- phone => ['yes','no','req'],
- user => ['yes','no'],
- cc => ['yes','no'],
- course => ['yes','no'],
- section => ['yes','no'],
- screenshot => ['yes','no'],
- );
- my %fieldoptions = &Apache::lonlocal::texthash (
- 'yes' => 'Optional',
- 'req' => 'Required',
- 'no' => "Not shown",
- );
- return (\@fields,\%titles,\%fieldoptions,\%possoptions);
-}
-
sub tool_titles {
my %titles = &Apache::lonlocal::texthash (
aboutme => 'Personal web page',
@@ -5061,32 +3969,17 @@ sub print_usercreation {
sub print_selfcreation {
my ($position,$dom,$settings,$rowtotal) = @_;
- my (@selfcreate,$createsettings,$processing,$emailoptions,$emailverified,
- $emaildomain,$datatable);
+ my (@selfcreate,$createsettings,$datatable);
if (ref($settings) eq 'HASH') {
if (ref($settings->{'cancreate'}) eq 'HASH') {
$createsettings = $settings->{'cancreate'};
- if (ref($createsettings) eq 'HASH') {
- if (ref($createsettings->{'selfcreate'}) eq 'ARRAY') {
- @selfcreate = @{$createsettings->{'selfcreate'}};
- } elsif ($createsettings->{'selfcreate'} ne '') {
- if ($settings->{'cancreate'}{'selfcreate'} eq 'any') {
- @selfcreate = ('email','login','sso');
- } elsif ($createsettings->{'selfcreate'} ne 'none') {
- @selfcreate = ($createsettings->{'selfcreate'});
- }
- }
- if (ref($createsettings->{'selfcreateprocessing'}) eq 'HASH') {
- $processing = $createsettings->{'selfcreateprocessing'};
- }
- if (ref($createsettings->{'emailoptions'}) eq 'HASH') {
- $emailoptions = $createsettings->{'emailoptions'};
- }
- if (ref($createsettings->{'emailverified'}) eq 'HASH') {
- $emailverified = $createsettings->{'emailverified'};
- }
- if (ref($createsettings->{'emaildomain'}) eq 'HASH') {
- $emaildomain = $createsettings->{'emaildomain'};
+ if (ref($settings->{'cancreate'}{'selfcreate'}) eq 'ARRAY') {
+ @selfcreate = @{$settings->{'cancreate'}{'selfcreate'}};
+ } elsif ($settings->{'cancreate'}{'selfcreate'} ne '') {
+ if ($settings->{'cancreate'}{'selfcreate'} eq 'any') {
+ @selfcreate = ('email','login','sso');
+ } elsif ($settings->{'cancreate'}{'selfcreate'} ne 'none') {
+ @selfcreate = ($settings->{'cancreate'}{'selfcreate'});
}
}
}
@@ -5094,7 +3987,6 @@ sub print_selfcreation {
my %radiohash;
my $numinrow = 4;
map { $radiohash{'cancreate_'.$_} = 1; } @selfcreate;
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
if ($position eq 'top') {
my %choices = &Apache::lonlocal::texthash (
cancreate_login => 'Institutional Login',
@@ -5109,470 +4001,96 @@ sub print_selfcreation {
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
\%choices,$itemcount,$onclick);
$$rowtotal += $itemcount;
+
+ my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
if (ref($usertypes) eq 'HASH') {
if (keys(%{$usertypes}) > 0) {
$datatable .= &insttypes_row($createsettings,$types,$usertypes,
$dom,$numinrow,$othertitle,
- 'statustocreate',$rowtotal);
+ 'statustocreate',$$rowtotal);
$$rowtotal ++;
}
}
- my @fields = ('lastname','firstname','middlename','permanentemail','id','inststatus');
- my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
- $fieldtitles{'inststatus'} = &mt('Institutional status');
- my $rem;
- my $numperrow = 2;
- my $css_class = $$rowtotal%2?' class="LC_odd_row"':'';
- $datatable .= ''.
- '
'.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').'
\n";
- return $output;
+ return $datatable;
}
sub captcha_choice {
- my ($context,$settings,$itemcount,$customcss,$rowstyle) = @_;
- my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext,
- $vertext,$currver);
+ my ($context,$settings,$itemcount) = @_;
+ my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext);
my %lt = &captcha_phrases();
$keyentry = 'hidden';
if ($context eq 'cancreate') {
@@ -5590,11 +4108,6 @@ sub captcha_choice {
$pubtext = $lt{'pub'};
$privtext = $lt{'priv'};
$keyentry = 'text';
- $vertext = $lt{'ver'};
- $currver = $settings->{'recaptchaversion'};
- if ($currver ne '2') {
- $currver = 1;
- }
}
if (ref($settings->{'recaptchakeys'}) eq 'HASH') {
$currpub = $settings->{'recaptchakeys'}{'public'};
@@ -5603,20 +4116,7 @@ sub captcha_choice {
} else {
$checked{'original'} = ' checked="checked"';
}
- my $css_class;
- if ($itemcount%2) {
- $css_class = 'LC_odd_row';
- }
- if ($customcss) {
- $css_class .= " $customcss";
- }
- $css_class =~ s/^\s+//;
- if ($css_class) {
- $css_class = ' class="'.$css_class.'"';
- }
- if ($rowstyle) {
- $css_class .= ' style="'.$rowstyle.'"';
- }
+ my $css_class = $itemcount%2?' class="LC_odd_row"':'';
my $output = ''.
'
'.$rowname.'
'."\n".
'
'."\n";
@@ -5635,35 +4135,35 @@ sub captcha_choice {
# specified for use with the key should be broad enough to accommodate all servers in the LON-CAPA domain.
#
$output .= '
'
.&initialize_categories($itemcount);
}
$$rowtotal += $itemcount;
@@ -6675,7 +4808,7 @@ sub print_serverstatuses {
''.
''.
- ''."\n";
+ ''."\n";
}
$$rowtotal += $rownum;
return $datatable;
@@ -6685,102 +4818,7 @@ sub serverstatus_pages {
return ('userstatus','lonstatus','loncron','server-status','codeversions',
'checksums','clusterstatus','metadata_keywords','metadata_harvest',
'takeoffline','takeonline','showenv','toggledebug','ping','domconf',
- 'uniquecodes','diskusage','coursecatalog');
-}
-
-sub defaults_javascript {
- my ($settings) = @_;
- my $intauthcheck = &mt('Warning: disallowing login for an authenticated user if the stored cost is less than the default will require a password reset by/for the user.');
- my $intauthcost = &mt('Warning: bcrypt encryption cost for internal authentication must be an integer.');
- &js_escape(\$intauthcheck);
- &js_escape(\$intauthcost);
- my $intauthjs = <<"ENDSCRIPT";
-
-function warnIntAuth(field) {
- if (field.name == 'intauth_check') {
- if (field.value == '2') {
- alert('$intauthcheck');
- }
- }
- if (field.name == 'intauth_cost') {
- field.value.replace(/\s/g,'');
- if (field.value != '') {
- var regexdigit=/^\\d+\$/;
- if (!regexdigit.test(field.value)) {
- alert('$intauthcost');
- }
- }
- }
- return;
-}
-
-ENDSCRIPT
-
- if (ref($settings) ne 'HASH') {
- return &Apache::lonhtmlcommon::scripttag($intauthjs);
- }
- if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
- my $maxnum = scalar(@{$settings->{'inststatusorder'}});
- if ($maxnum eq '') {
- $maxnum = 0;
- }
- $maxnum ++;
- my $jstext = ' var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');';
- return <<"ENDSCRIPT";
-
-
-ENDSCRIPT
- } else {
- return &Apache::lonhtmlcommon::scripttag($intauthjs);
- }
+ 'uniquecodes','diskusage');
}
sub coursecategories_javascript {
@@ -6805,12 +4843,9 @@ sub coursecategories_javascript {
$jstext = ' var categories = Array(1);'."\n".
' categories[0] = Array("instcode_pos");'."\n";
}
- my $instcode_reserved = &mt('The name: [_1] is a reserved category.','"instcode"');
- my $communities_reserved = &mt('The name: [_1] is a reserved category.','"communities"');
- my $choose_again = "\n".&mt('Please use a different name for the new top level category.');
- &js_escape(\$instcode_reserved);
- &js_escape(\$communities_reserved);
- &js_escape(\$choose_again);
+ my $instcode_reserved = &mt('The name: "instcode" is a reserved category');
+ my $communities_reserved = &mt('The name: "communities" is a reserved category');
+ my $choose_again = '\\n'.&mt('Please use a different name for the new top level category');
$output = <<"ENDSCRIPT";