'.
- &mt('Nothing to set here, as the cluster to which this domain belongs only contains this server.');
+ &mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.');
}
} else {
if (keys(%by_location) == 0) {
$datatable .= ''.
- &mt('Nothing to set here, as the cluster to which this domain belongs only contains this institution.');
+ &mt('Nothing to set here, as the cluster to which this domain belongs only contains one institution.');
} else {
my %lt = &usersession_titles();
my $numinrow = 5;
@@ -2485,14 +2661,16 @@ sub build_location_hashes {
sub current_offloads_to {
my ($dom,$settings,$servers) = @_;
my (%spareid,%otherdomconfigs);
- if ((ref($settings) eq 'HASH') && (ref($servers) eq 'HASH')) {
+ if (ref($servers) eq 'HASH') {
foreach my $lonhost (sort(keys(%{$servers}))) {
my $gotspares;
- 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;
+ 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) {
@@ -2538,13 +2716,18 @@ sub current_offloads_to {
$spareid{$lonhost}{'primary'} = $Apache::lonnet::spareid{'primary'};
$spareid{$lonhost}{'default'} = $Apache::lonnet::spareid{'default'};
} else {
- my %requested;
- $requested{'spareid'} = 'HASH';
- my %returnhash = &Apache::lonnet::get_remote_globals($lonhost,\%requested);
- my $spareshash = $returnhash{'spareid'};
- if (ref($spareshash) eq 'HASH') {
- $spareid{$lonhost}{'primary'} = $spareshash->{'primary'};
- $spareid{$lonhost}{'default'} = $spareshash->{'default'};
+ 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'};
+ }
+ }
}
}
}
@@ -2555,54 +2738,104 @@ sub current_offloads_to {
}
sub spares_row {
- my ($servers,$spareid,$uniques,$rowtotal) = @_;
+ my ($dom,$servers,$spareid,$serverhomes,$altids,$rowtotal) = @_;
my $css_class;
my $numinrow = 4;
my $itemcount = 1;
my $datatable;
- if ((ref($servers) eq 'HASH') && (ref($spareid) eq 'HASH')) {
+ 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]',''.$serverdom.' ');
+ } else {
+ $serverdom = &Apache::lonnet::host_domain($server);
+ if ($serverdom ne $dom) {
+ $othercontrol = &mt('Session offloading controlled by domain: [_1]',''.$serverdom.' ');
+ }
+ }
+ next unless (ref($spareid->{$server}) eq 'HASH');
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
$datatable .= '
- '.$server.' when busy, offloads to: ';
+ '.
+ &mt('[_1] when busy, offloads to:'
+ ,''.$server.' ').
+ "\n";
my (%current,%canselect);
- if (ref($spareid->{$server}) eq 'HASH') {
- foreach my $type ('primary','default') {
+ 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) {
- $current{$type} .= '';
- for (my $i=0; $i<@spares; $i++) {
- my $rem = $i%($numinrow);
- if ($rem == 0) {
- if ($i > 0) {
- $current{$type} .= '';
+ if ($othercontrol) {
+ $current{$type} = join(', ',@spares);
+ } else {
+ $current{$type} .= '';
}
- $current{$type} .= '
';
}
}
if ($current{$type} eq '') {
$current{$type} = &mt('None specified');
}
- $canselect{$type} =
- &newspare_select($server,$type,$spareid->{$server}{$type},$uniques);
+ if ($othercontrol) {
+ if ($type eq 'primary') {
+ $canselect{$type} = $othercontrol;
+ }
+ } else {
+ $canselect{$type} =
+ &mt('Add new [_1]'.$type.'[_2]:','',' ').' '.
+ ''."\n".
+ ''.&mt('Select').' '."\n";
+ if (@choices > 0) {
+ foreach my $lonhost (@choices) {
+ $canselect{$type} .= ''.$lonhost.' '."\n";
+ }
+ }
+ $canselect{$type} .= ' '."\n";
+ }
+ } else {
+ $current{$type} = &mt('Could not be determined');
+ if ($type eq 'primary') {
+ $canselect{$type} = $othercontrol;
+ }
+ }
+ if ($type eq 'default') {
+ $datatable .= '';
}
+ $datatable .= ''.$typetitles{$type}.' '.$current{$type}.' '."\n".
+ ''.$canselect{$type}.' '."\n";
}
- $datatable .= ''.&mt('primary').' '.$current{'primary'}.' '.
- ''.&mt('Add new [_1]primary[_2]:','',' ').' '.
- $canselect{'primary'}.' '.
- ''.
- ''.&mt('default').' '.$current{'default'}.' '.
- ''.&mt('Add new [_1]default[_2]:','',' ').' '.
- $canselect{'default'}.' ';
$itemcount ++;
}
}
@@ -2610,28 +2843,375 @@ sub spares_row {
return $datatable;
}
-sub newspare_select {
- my ($server,$type,$currspares,$uniques) = @_;
- my $output;
- if (ref($uniques) eq 'HASH') {
- if (keys(%{$uniques}) > 1) {
- $output = ''."\n".
- ''.&mt('Select').' '."\n";
- foreach my $lonhost (sort(keys(%{$uniques}))) {
- next if ($lonhost eq $server);
- if (ref($currspares) eq 'ARRAY') {
- if (@{$currspares} > 0) {
- next if (grep(/^\Q$lonhost\E$/,@{$currspares}));
+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 .= ''.
+ ''.
+ '';
+ if ($lonhost eq '') {
+ $datatable .= '';
+ if (keys(%currbalancer) > 0) {
+ $datatable .= &mt('Add balancer:');
+ } else {
+ $datatable .= &mt('Enable balancer:');
+ }
+ $datatable .= ' '.
+ ''."\n".
+ ''.&mt('None').
+ ' '."\n";
+ foreach my $server (sort(keys(%servers))) {
+ next if ($currbalancer{$server});
+ $datatable .= ''.$server.' '."\n";
+ }
+ $datatable .=
+ ' '."\n".
+ ' '."\n";
+ } else {
+ $datatable .= ''.$lonhost.' '.
+ ' ';
+ $targets_div_style = 'display: block';
+ $disabled_div_style = 'display: none';
+ if ($dom eq &Apache::lonnet::host_domain($lonhost)) {
+ $homedom_div_style = 'display: block';
+ }
+ }
+ $datatable .= '
'.
+ ''.$disabledtext.'
'."\n".
+ ''.&mt('Offloads to:').''.$lonhost.' '."\n";
+ my ($chkboxval,$disabled);
+ if (($lonhost ne '') && (exists($servers{$lonhost}))) {
+ $chkboxval = $spares[$i];
+ }
+ if (exists($currbalancer{$spares[$i]})) {
+ $disabled = ' disabled="disabled"';
+ }
+ $targettable .=
+ '
'.$chkboxval.
+ ' ';
+ }
+ if ($i < $numspares-1) {
+ $targettable .= '';
+ }
+ }
+ }
+ if ($targettable ne '') {
+ my $rem = $numspares%($numinrow);
+ my $colsleft = $numinrow - $rem;
+ if ($colsleft > 1 ) {
+ $targettable .= ''.
+ ' ';
+ } elsif ($colsleft == 1) {
+ $targettable .= ' ';
+ }
+ $datatable .= ''.$typetitles{$sparetype}.' '.
+ &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 .= '';
}
+ } 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 = '
';
+ }
+ my $output =
+ ''.$space.
+ ''.$title.'
'."\n".
+ ''.$space.
+ ''."\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 =
+ ': '."\n".
+ ''.$server.' ';
+ }
+ $extra .= ' ';
+ }
+ } elsif ($rule eq $current) {
+ $checked = ' checked="checked"';
+ }
+ $output .= ''.
+ ' '.$extra.'
'.
+ ''.$rowname.' '."\n".
+ ''."\n".
+ ' ';
+ return $output;
+}
+
sub user_formats_row {
my ($type,$settings,$rules,$ruleorder,$numinrow,$rowcount) = @_;
my $output;
@@ -3041,6 +3692,12 @@ sub print_defaults {
} elsif ($item eq 'datelocale_def') {
my $includeempty = 1;
$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 {
my $size;
if ($item eq 'portal_def') {
@@ -3056,6 +3713,17 @@ sub print_defaults {
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 {
my ($dom) = @_;
my %titles = &Apache::lonlocal::texthash (
@@ -3516,8 +4184,8 @@ sub print_serverstatuses {
sub serverstatus_pages {
return ('userstatus','lonstatus','loncron','server-status','codeversions',
- 'clusterstatus','metadata_keywords','metadata_harvest',
- 'takeoffline','takeonline','showenv','toggledebug');
+ 'checksums','clusterstatus','metadata_keywords','metadata_harvest',
+ 'takeoffline','takeonline','showenv','toggledebug','ping','domconf');
}
sub coursecategories_javascript {
@@ -3831,9 +4499,13 @@ sub insttypes_row {
if ($context eq 'cansearch') {
$showdom = ' ('.$dom.')';
}
+ my $class = 'LC_left_item';
+ if ($context eq 'statustocreate') {
+ $class = 'LC_right_item';
+ }
my $output = ''.
''.$lt{$context}.$showdom.
- ' ';
+ '';
my $rem;
if (ref($types) eq 'ARRAY') {
for (my $i=0; $i<@{$types}; $i++) {
@@ -3963,13 +4635,14 @@ sub usertype_update_row {
sub modify_login {
my ($r,$dom,$confname,%domconfig) = @_;
- my ($resulttext,$errors,$colchgtext,%changes,%colchanges);
- my %title = ( coursecatalog => 'Display course catalog',
- adminmail => 'Display administrator E-mail address',
- newuser => 'Link for visitors to create a user account',
- loginheader => 'Log-in box header');
- my @offon = ('off','on');
- my %curr_loginvia;
+ my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl,
+ %curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon);
+ %title = ( coursecatalog => 'Display course catalog',
+ adminmail => 'Display administrator E-mail address',
+ helpdesk => 'Display "Contact Helpdesk" link',
+ newuser => 'Link for visitors to create a user account',
+ loginheader => 'Log-in box header');
+ @offon = ('off','on');
if (ref($domconfig{login}) eq 'HASH') {
if (ref($domconfig{login}{loginvia}) eq 'HASH') {
foreach my $lonhost (keys(%{$domconfig{login}{loginvia}})) {
@@ -3977,10 +4650,9 @@ sub modify_login {
}
}
}
- my %loginhash;
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'],
\%domconfig,\%loginhash);
- my @toggles = ('coursecatalog','adminmail','newuser');
+ my @toggles = ('coursecatalog','adminmail','helpdesk','newuser');
foreach my $item (@toggles) {
$loginhash{login}{$item} = $env{'form.'.$item};
}
@@ -3990,7 +4662,7 @@ sub modify_login {
\%loginhash);
}
- my %servers = &dom_servers($dom);
+ my %servers = &Apache::lonnet::internet_dom_servers($dom);
my @loginvia_attribs = ('serverpath','custompath','exempt');
if (keys(%servers) > 1) {
foreach my $lonhost (keys(%servers)) {
@@ -4050,7 +4722,6 @@ sub modify_login {
$new = '';
}
}
-
$loginhash{login}{loginvia}{$lonhost}{$item} = $new;
}
}
@@ -4076,12 +4747,103 @@ 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 .= ''.$puberror.' '.$error.' '.$chg.' ';
+ } 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 .= ''.&Apache::loncommon::modal_link(
+ $loginhash{'login'}{'helpurl'}{$lang}.
+ '?inhibitmenu=yes',$chg,600,500).
+ ' ';
+ }
+ }
+ }
+ } 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 .= ''.$chgtxt.' ';
+ }
+ } 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').'';
+ if (!$pubkey) {
+ $chgtxt .= ''.&mt('Public key deleted').' ';
+ } else {
+ $chgtxt .= ''.&mt('Public key set to [_1]',$pubkey).' ';
+ }
+ if (!$privkey) {
+ $chgtxt .= ''.&mt('Private key deleted').' ';
+ } else {
+ $chgtxt .= ''.&mt('Private key set to [_1]',$pubkey).' ';
+ }
+ $chgtxt .= ' ';
+ $resulttext .= ''.$chgtxt.' ';
+ }
} else {
$resulttext .= ''.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").' ';
}
@@ -4585,15 +5409,17 @@ sub publishlogo {
# See if there is anything left
unless ($fname) { return ('error: no uploaded file'); }
$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);
$file=$fname;
if ($fname=~m|/|) {
($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|);
}
- my @parts=split(/\//,$filepath.'/'.$fnamepath);
+ my @parts=split(/\//,"$filepath/$relpath/$fnamepath");
my $count;
- for ($count=4;$count<=$#parts;$count++) {
+ for ($count=5;$count<=$#parts;$count++) {
$filepath.="/$parts[$count]";
if ((-e $filepath)!=1) {
mkdir($filepath,02770);
@@ -4640,7 +5466,6 @@ $env{'user.name'}.':'.$env{'user.domain'
close(FH);
chmod(0660, $source); # Permissions to rw-rw---.
- my $docroot=$r->dir_config('lonDocRoot');
my $targetdir=$docroot.'/res/'.$dom.'/'.$confname .'/'.$fnamepath;
my $copyfile=$targetdir.'/'.$file;
@@ -4663,8 +5488,15 @@ $env{'user.name'}.':'.$env{'user.domain'
if (copy($source,$copyfile)) {
print $logfile "\nCopied original source to ".$copyfile."\n";
$output = 'ok';
- &write_metadata($dom,$confname,$formname,$targetdir,$file,$logfile);
$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 {
print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
$output = &mt('Failed to copy file to RES space').", $!";
@@ -4682,8 +5514,15 @@ $env{'user.name'}.':'.$env{'user.domain'
my $copyfile=$targetdir.'/tn-'.$file;
if (copy($outfile,$copyfile)) {
print $logfile "\nCopied source to ".$copyfile."\n";
- &write_metadata($dom,$confname,$formname,
- $targetdir,'tn-'.$file,$logfile);
+ my $thumb_metaoutput =
+ &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 {
print $logfile "\nUnable to write ".$copyfile.
':'.$!."\n";
@@ -4748,30 +5587,79 @@ sub write_metadata {
{
print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file;
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},'<>&"')
+ .'';
+ }
+ }
+ $output = 'ok';
+ print $logfile "\nWrote metadata";
+ close($mfh);
+ } else {
+ print $logfile "\nFailed to open metadata file";
$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},'<>&"')
- .'';
- }
- }
- $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 {
@@ -4784,7 +5672,7 @@ sub check_switchserver {
my @ids=&Apache::lonnet::current_machine_ids();
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
if (!$allowed) {
- $switchserver=''.&mt('Switch Server').' ';
+ $switchserver=''.&mt('Switch Server').' ';
}
return $switchserver;
}
@@ -4805,8 +5693,11 @@ sub modify_quotas {
%titles = &courserequest_titles();
$toolregexp = join('|',@usertools);
%conditions = &courserequest_conditions();
+ } elsif ($context eq 'requestauthor') {
+ @usertools = ('author');
+ %titles = &authorrequest_titles();
} else {
- @usertools = ('aboutme','blog','portfolio');
+ @usertools = ('aboutme','blog','webdav','portfolio');
%titles = &tool_titles();
}
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
@@ -4822,6 +5713,10 @@ sub modify_quotas {
$confhash{$item}{$type} = $env{$key};
}
}
+ } elsif ($context eq 'requestauthor') {
+ if ($key =~ /^\Qform.authorreq_\E(.+)$/) {
+ $confhash{$1} = $env{$key};
+ }
} else {
if ($key =~ /^form\.quota_(.+)$/) {
$confhash{'defaultquota'}{$1} = $env{$key};
@@ -4831,7 +5726,7 @@ sub modify_quotas {
}
}
}
- if ($context eq 'requestcourses') {
+ if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
my @approvalnotify = &Apache::loncommon::get_env_multiple('form.reqapprovalnotify');
@approvalnotify = sort(@approvalnotify);
$confhash{'notify'}{'approval'} = join(',',@approvalnotify);
@@ -4867,6 +5762,11 @@ sub modify_quotas {
$confhash{$item}{$type} .= $limithash{$item}{$type};
}
}
+ } elsif ($context eq 'requestauthor') {
+ $unset = '0';
+ if ($type eq '_LC_adv') {
+ $unset = '';
+ }
} else {
if (grep(/^\Q$type\E$/,@{$toolshash{$item}})) {
$confhash{$item}{$type} = 1;
@@ -4875,7 +5775,11 @@ sub modify_quotas {
}
}
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}) {
$changes{$item}{$type} = 1;
}
@@ -4895,6 +5799,10 @@ sub modify_quotas {
if ($confhash{$item}{$type} ne $unset) {
$changes{$item}{$type} = 1;
}
+ } elsif ($context eq 'requestauthor') {
+ if ($confhash{$type} ne $unset) {
+ $changes{$type} = 1;
+ }
} else {
if (!$confhash{$item}{$type}) {
$changes{$item}{$type} = 1;
@@ -4903,7 +5811,7 @@ sub modify_quotas {
}
}
}
- unless ($context eq 'requestcourses') {
+ unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
if (ref($domconfig{'quotas'}) eq 'HASH') {
if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') {
foreach my $key (keys(%{$domconfig{'quotas'}{'defaultquota'}})) {
@@ -4946,10 +5854,14 @@ sub modify_quotas {
}
}
- foreach my $key (keys(%confhash)) {
- $domdefaults{$key} = $confhash{$key};
+ if ($context eq 'requestauthor') {
+ $domdefaults{'requestauthor'} = \%confhash;
+ } else {
+ foreach my $key (keys(%confhash)) {
+ $domdefaults{$key} = $confhash{$key};
+ }
}
-
+
my %quotahash = (
$action => { %confhash }
);
@@ -4961,7 +5873,8 @@ sub modify_quotas {
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
$resulttext = &mt('Changes made:').'';
- unless ($context eq 'requestcourses') {
+ unless (($context eq 'requestcourses') ||
+ ($context eq 'requestauthor')) {
if (ref($changes{'defaultquota'}) eq 'HASH') {
$resulttext .= ''.&mt('Portfolio default quotas').'';
foreach my $type (@{$types},'default') {
@@ -4978,12 +5891,25 @@ sub modify_quotas {
}
my %newenv;
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 =
&Apache::lonnet::usertools_access($env{'user.name'},
$env{'user.domain'},
$item,'reload',$context);
- if ($context eq 'requestcourses') {
+ if (($context eq 'requestcourses') ||
+ ($context eq 'requestauthor')) {
if ($env{'environment.canrequest.'.$item} ne $newacc) {
$newenv{'environment.canrequest.'.$item} = $newacc;
}
@@ -4992,34 +5918,40 @@ sub modify_quotas {
$newenv{'environment.availabletools.'.$item} = $newacc;
}
}
- $resulttext .= ''.$titles{$item}.'';
+ unless ($context eq 'requestauthor') {
+ $resulttext .= ''.$titles{$item}.'';
+ }
foreach my $type (@{$types},'default','_LC_adv') {
- if ($changes{$item}{$type}) {
+ if ($haschgs{$type}) {
my $typetitle = $usertypes->{$type};
if ($type eq 'default') {
$typetitle = $othertitle;
} elsif ($type eq '_LC_adv') {
$typetitle = 'LON-CAPA Advanced Users';
}
- if ($confhash{$item}{$type}) {
+ if ($inconf{$type}) {
if ($context eq 'requestcourses') {
my $cond;
- if ($confhash{$item}{$type} =~ /^autolimit=(\d*)$/) {
+ if ($inconf{$type} =~ /^autolimit=(\d*)$/) {
if ($1 eq '') {
$cond = &mt('(Automatic processing of any request).');
} else {
$cond = &mt('(Automatic processing of requests up to limit of [quant,_1,request] per user).',$1);
}
} else {
- $cond = $conditions{$confhash{$item}{$type}};
+ $cond = $conditions{$inconf{$type}};
}
$resulttext .= ''.&mt('Set to be available to [_1].',$typetitle).' '.$cond.' ';
+ } elsif ($context eq 'requestauthor') {
+ $resulttext .= ''.&mt('Set to "[_1]" for "[_2]".',
+ $titles{$inconf{$type}},$typetitle);
+
} else {
$resulttext .= ' '.&mt('Set to be available to [_1]',$typetitle).' ';
}
} else {
if ($type eq '_LC_adv') {
- if ($confhash{$item}{$type} eq '0') {
+ if ($inconf{$type} eq '0') {
$resulttext .= ''.&mt('Set to be unavailable to [_1]',$typetitle).' ';
} else {
$resulttext .= ''.&mt('No override set for [_1]',$typetitle).' ';
@@ -5030,17 +5962,19 @@ sub modify_quotas {
}
}
}
- $resulttext .= ' ';
+ unless ($context eq 'requestauthor') {
+ $resulttext .= ' ';
+ }
}
}
- if ($action eq 'requestcourses') {
+ if (($action eq 'requestcourses') || ($action eq 'requestauthor')) {
if (ref($changes{'notify'}) eq 'HASH') {
if ($changes{'notify'}{'approval'}) {
if (ref($confhash{'notify'}) eq 'HASH') {
if ($confhash{'notify'}{'approval'}) {
$resulttext .= ''.&mt('Notification of requests requiring approval will be sent to: ').$confhash{'notify'}{'approval'}.' ';
} else {
- $resulttext .= ''.&mt('No Domain Coordinators will receive notification of course requests requiring approval.').' ';
+ $resulttext .= ''.&mt('No Domain Coordinators will receive notification of requests requiring approval.').' ';
}
}
}
@@ -5053,6 +5987,8 @@ sub modify_quotas {
} else {
if ($context eq 'requestcourses') {
$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 {
$resulttext = &mt('No changes made to availability of personal information pages, blogs, portfolios or default quotas');
}
@@ -5383,13 +6319,16 @@ sub modify_autocreate {
foreach my $item (@types) {
if ($changes{$item}) {
my $newtxt = $offon[$newvals{$item}];
- $resulttext .= ''.&mt("$title{$item} set to [_1]$newtxt [_2]",'',' ').' ';
+ $resulttext .= ''.
+ &mt("$title{$item} set to [_1]$newtxt [_2]",
+ '',' ').
+ ' ';
}
}
if ($changes{'xmldc'}) {
my ($dcname,$dcdom) = split(':',$newvals{'xmldc'});
my $newtxt = &Apache::loncommon::plainname($dcname,$dcdom);
- $resulttext .= ''.&mt("$title{'xmldc'} set to [_1]$newtxt [_2]",'',' ').' ';
+ $resulttext .= ''.&mt("$title{'xmldc'} set to [_1]",''.$newtxt.' ').' ';
}
$resulttext .= ' ';
} else {
@@ -5535,7 +6474,11 @@ sub modify_directorysrch {
} else {
$chgtext =~ s/\; $//;
}
- $resulttext .= ' '.&mt("Users from domain '[_1] ' permitted to search the institutional directory set to: [_2]",$dom,$chgtext).' ';
+ $resulttext .=
+ ''.
+ &mt("Users from domain '[_1]' permitted to search the institutional directory set to: [_2]",
+ ''.$dom.' ',$chgtext).
+ ' ';
}
}
}
@@ -5563,7 +6506,7 @@ sub modify_directorysrch {
}
}
$chgtext =~ s/\; $//;
- $resulttext .= ''.&mt("$title{'searchtypes'} set to: \"[_1]\"",$chgtext).' ';
+ $resulttext .= ''.&mt($title{'searchtypes'}.' set to: "[_1]"',$chgtext).' ';
}
$resulttext .= ' ';
} else {
@@ -5587,7 +6530,7 @@ sub modify_contacts {
my (%others,%to,%bcc);
my @contacts = ('supportemail','adminemail');
my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail',
- 'requestsmail');
+ 'requestsmail','updatesmail');
foreach my $type (@mailings) {
@{$newsetting{$type}} =
&Apache::loncommon::get_env_multiple('form.'.$type);
@@ -5643,6 +6586,7 @@ sub modify_contacts {
$default{'helpdeskmail'} = 'supportemail';
$default{'lonstatusmail'} = 'adminemail';
$default{'requestsmail'} = 'adminemail';
+ $default{'updatesmail'} = 'adminemail';
foreach my $item (@contacts) {
if ($to{$item} ne $default{$item}) {
$changes{$item} = 1;
@@ -5747,6 +6691,7 @@ sub modify_usercreation {
}
push(@contexts,'statustocreate');
}
+ &process_captcha('cancreate',\%changes,\%cancreate,\%curr_usercreation);
if (ref($curr_usercreation{'cancreate'}) eq 'HASH') {
foreach my $item (@contexts) {
if (($item eq 'selfcreate') || ($item eq 'statustocreate')) {
@@ -5929,7 +6874,7 @@ sub modify_usercreation {
my %lt = &usercreation_types();
foreach my $type (@{$changes{'cancreate'}}) {
my $chgtext;
- unless ($type eq 'statustocreate') {
+ unless (($type eq 'statustocreate') || ($type eq 'captcha') || ($type eq 'recaptchakeys')) {
$chgtext = $lt{$type}.', ';
}
if ($type eq 'selfcreate') {
@@ -5988,6 +6933,35 @@ 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').'';
+ if (!$pubkey) {
+ $chgtext .= ''.&mt('Public key deleted').' ';
+ } else {
+ $chgtext .= ''.&mt('Public key set to [_1]',$pubkey).' ';
+ }
+ if (!$privkey) {
+ $chgtext .= ''.&mt('Private key deleted').' ';
+ } else {
+ $chgtext .= ''.&mt('Private key set to [_1]',$pubkey).' ';
+ }
+ $chgtext .= ' ';
} else {
if ($cancreate{$type} eq 'none') {
$chgtext .= &mt('creation of new users is not permitted, except by a Domain Coordinator.');
@@ -6087,6 +7061,59 @@ sub modify_usercreation {
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'};
+ unless ($newsettings->{'captcha'} eq 'recaptcha') {
+ $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 {
my ($dom,%domconfig) = @_;
my ($resulttext,%curr_usermodification,%changes);
@@ -6743,122 +7770,56 @@ sub modify_serverstatuses {
sub modify_helpsettings {
my ($r,$dom,$confname,%domconfig) = @_;
- my ($resulttext,$errors,%changes,%helphash);
-
- my $customhelpfile = $env{'form.loginhelpurl.filename'};
- 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 ($resulttext,$errors,%changes,%helphash);
+ my %defaultchecked = ('submitbugs' => 'on');
+ my @offon = ('off','on');
my @toggles = ('submitbugs');
-
- $helphash{'helpsettings'} = {};
-
- if (ref($domconfig{'helpsettings'}) ne 'HASH') {
- if ($domconfig{'helpsettings'} eq '') {
- $domconfig{'helpsettings'} = {};
- }
- }
-
if (ref($domconfig{'helpsettings'}) eq 'HASH') {
-
foreach my $item (@toggles) {
-
- if ($defaultchecked{$item} eq 'on') {
- if (($domconfig{'helpsettings'}{$item} eq '') &&
- ($env{'form.'.$item} eq '0')) {
- $changes{$item} = 1;
- } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
- $changes{$item} = 1;
- }
- } elsif ($defaultchecked{$item} eq 'off') {
- if (($domconfig{'helpsettings'}{$item} eq '') &&
- ($env{'form.'.$item} eq '1')) {
- $changes{$item} = 1;
- } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
- $changes{$item} = 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 .= ''.$error.' ';
- foreach my $item (sort(keys(%changes))) {
- if ($item eq 'submitbugs') {
- $resulttext .= ''.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").' ';
- }
- if ($item eq 'loginhelpurl') {
- if ($helphash{'helpsettings'}{'loginhelpurl'} eq '') {
- $resulttext .= ''.&mt('[_1] help file removed; [_2] file will be used for the unathorized help page in this domain.',$customhelpfile,$defaulthelpfile).' ';
- } else {
- $resulttext .= ''.&mt("$title{$item} [_1]",$customhelpfile).' ';
- }
- }
- }
- $resulttext .= ' ';
- } else {
- $resulttext = &mt('No changes made to help settings');
- }
- } else {
- $resulttext = ''.
- &mt('An error occurred: [_1]',$putresult).' ';
+ $putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom);
+ if ($putresult eq 'ok') {
+ $resulttext = &mt('Changes made:').'';
+ foreach my $item (sort(keys(%changes))) {
+ if ($item eq 'submitbugs') {
+ $resulttext .= ''.&mt('Display link to: [_1] set to "'.$offon[$env{'form.'.$item}].'".',
+ &Apache::loncommon::modal_link('http://bugs.loncapa.org',
+ &mt('LON-CAPA bug tracker'),600,500)).' ';
+ }
+ }
+ $resulttext .= ' ';
+ } else {
+ $resulttext = &mt('No changes made to help settings');
+ $errors .= ''.
+ &mt('An error occurred storing the settings: [_1]',
+ $putresult).' '.
+ $resulttext .= ''.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).' ';
+ } elsif ($item eq 'coursecredits') {
+ if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
+ if (($domdefaults{'officialcredits'} eq '') &&
+ ($domdefaults{'unofficialcredits'} eq '')) {
+ $resulttext .= ''.&mt('Student credits not in use for courses in this domain').' ';
+ } else {
+ $resulttext .= ''.&mt('Student credits can be set per course by a Domain Coordinator, with the following defaults applying:').''.
+ ''.&mt('Official courses: [_1]',$defaultshash{'coursedefaults'}{'coursecredits'}{'official'}).' '.
+ ''.&mt('Unofficial courses: [_1]',$defaultshash{'coursedefaults'}{'coursecredits'}{'unofficial'}).' '.
+ ' '.
+ ' ';
+ }
+ } else {
+ $resulttext .= ''.&mt('Student credits not in use for courses in this domain').' ';
+ }
}
}
$resulttext .= ' ';
@@ -7061,42 +8064,33 @@ sub modify_usersessions {
}
my @alldoms = &Apache::lonnet::all_domains();
- my %uniques = &Apache::lonnet::get_unique_servers(\@alldoms);
- my %servers = &dom_servers($dom);
+ 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) {
- unless (($server eq $lonhost) || ($server eq $serverhomeID)) {
- if ($uniques{$server}) {
- push(@okspares,$server);
+ 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 '') && ($uniques{$new})) {
- unless (($new eq $lonhost) || ($new eq $serverhomeID)) {
+ if (($new ne '') && (&Apache::lonnet::hostname($new))) {
+ unless (&Apache::lonnet::hostname($new) eq $serverhostname) {
$newspare = $new;
- $spareschg{$type} = 1;
- }
- }
- if (ref($spareid{$lonhost}) eq 'HASH') {
- if (ref($spareid{$lonhost}{$type}) eq 'ARRAY') {
- my @diffs = &Apache::loncommon::compare_arrays($domconfig{'usersessions'}{'spares'}{$lonhost}{$type},\@okspares);
- if (@diffs > 0) {
- $spareschg{$type} = 1;
- } elsif ($new ne '') {
- $spareschg{$type} = 1;
- }
}
}
my @spares;
@@ -7106,6 +8100,14 @@ sub modify_usersessions {
@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;
@@ -7214,6 +8216,206 @@ sub modify_usersessions {
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 .= ''.&mt('Load Balancing discontinued for: [_1]',$balancer).' ';
+ &Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom);
+ }
+ }
+ if (ref($changes{'add'}) eq 'ARRAY') {
+ foreach my $balancer (sort(@{$changes{'add'}})) {
+ $resulttext .= ''.&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 .= ' '.&mt("Servers to which Load Balance server offloads set to 'None', by default").' ';
+ } else {
+ my $showoffload;
+ foreach my $sparetype (@sparestypes) {
+ $showoffload .= ''.$typetitles{$sparetype}.' : ';
+ if (defined($offloadstr{$sparetype})) {
+ $showoffload .= $offloadstr{$sparetype};
+ } else {
+ $showoffload .= &mt('None');
+ }
+ $showoffload .= (' 'x3);
+ }
+ $resulttext .= ''.&mt('By default, Load Balancer: [_1] set to offload to - [_2]',$balancer,$showoffload).' ';
+ }
+ }
+ }
+ 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 .= ''.&mt('Load Balancer: [_1] -- balancing for [_2] set to - "[_3]"',$balancer,$titles->{$type},$balancetext).' ';
+ }
+ }
+ }
+ }
+ &Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom);
+ }
+ }
+ if ($resulttext ne '') {
+ $resulttext = &mt('Changes made:').'';
+ } else {
+ $resulttext = $nochgmsg;
+ }
+ } else {
+ $resulttext = $nochgmsg;
+ }
+ } else {
+ $resulttext = ''.
+ &mt('An error occurred: [_1]',$putresult).' ';
+ }
+ } else {
+ $resulttext = $nochgmsg;
+ }
+ return $resulttext;
+}
+
sub recurse_check {
my ($chkcats,$categories,$depth,$name) = @_;
if (ref($chkcats->[$depth]{$name}) eq 'ARRAY') {
@@ -7254,121 +8456,666 @@ sub recurse_cat_deletes {
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;
-}
-
sub get_active_dcs {
my ($dom) = @_;
- my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']);
+ my $now = time;
+ my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc'],$now,$now);
my %domcoords;
my $numdcs = 0;
- my $now = time;
foreach my $server (keys(%dompersonnel)) {
foreach my $user (sort(keys(%{$dompersonnel{$server}}))) {
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);
- my ($end,$start) = split(':',$dompersonnel{$server}{$user});
- if (($end eq '') || ($end == 0) || ($end > $now)) {
- if ($start <= $now) {
- $domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user};
- }
- }
+ $domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user};
}
}
return %domcoords;
}
sub active_dc_picker {
- my ($dom,$curr_dc) = @_;
+ my ($dom,$numinrow,$inputtype,$name,%currhash) = @_;
my %domcoords = &get_active_dcs($dom);
- my @dcs = sort(keys(%domcoords));
- my $numdcs = scalar(@dcs);
- my $datatable;
- my $numinrow = 2;
+ my @domcoord = keys(%domcoords);
+ if (keys(%currhash)) {
+ foreach my $dc (keys(%currhash)) {
+ unless (exists($domcoords{$dc})) {
+ push(@domcoord,$dc);
+ }
+ }
+ }
+ @domcoord = sort(@domcoord);
+ my $numdcs = scalar(@domcoord);
+ my $rows = 0;
+ my $table;
if ($numdcs > 1) {
- $datatable = '';
- for (my $i=0; $i<@dcs; $i++) {
+ $table = '';
- } elsif (@dcs) {
- $datatable .= '
';
+ } elsif ($numdcs == 1) {
+ if ($inputtype eq 'radio') {
+ $table .= '