Fix to separate drive and CPU temperatures collection #2208

bind8/conf_trusted.cgi

@@ -17,7 +17,6 @@ $access{'defaults'} || &error($text{'trusted_ecannot'});
 my $conf = &get_config();
 my $options = &find("options", $conf);
 my $mems = $options->{'members'};
-my @dlv = &find("dnssec-lookaside", $mems);
 my $tkeys = &find("trusted-keys", $conf);
 $tkeys ||= { 'members' => [ ] };
 
@@ -38,33 +37,6 @@ if (&supports_dnssec_client() == 2) {
 			    $text{'default'}, undef);
 	}
 
-# Trusted DLVs (obsolete)
-if (@dlv) {
-	my @dtable = ( );
-	my $i = 0;
-	foreach my $d (@dlv, { 'values' => [ '.' ] }) {
-		my $dlv = $d->{'values'}->[0];
-		$dlv = "" if ($dlv eq ".");
-		push(@dtable, [
-			&ui_opt_textbox("anchor_$i", $d->{'values'}->[2],
-					30, $text{'trusted_none'}),
-			&ui_opt_textbox("dlv_$i", $dlv, 20,
-					$text{'trusted_root'}) ]);
-		$i++;
-		}
-	print &ui_table_row($text{'trusted_dlvs'},
-		&ui_radio("dlv_auto",
-		  @dlv == 0 ? 2 :
-		  @dlv == 1 && $dlv[0]->{'values'}->[0] eq 'auto' ? 1 : 0,
-		  [ [ 1, $text{'trusted_dlvs1'} ],
-		    [ 2, $text{'trusted_dlvs2'} ],
-		    [ 0, $text{'trusted_dlvs0'} ] ])."<br>\n".
-		&ui_columns_table([ $text{'trusted_anchor'},
-				    $text{'trusted_dlv'} ],
-				  undef,
-				  \@dtable), 3);
-	}
-
 # Trusted keys
 if (@{$tkeys->{'members'}}) {
 	my @ktable = ( );

bind8/save_trusted.cgi

@@ -24,46 +24,6 @@ if (&supports_dnssec_client() == 2) {
 	&save_choice("dnssec-validation", $options, 1);
 	}
 
-# Save DLV zones
-if (defined($in{'dlv_auto'})) {
-	my @dlvs = ( );
-	if ($in{'dlv_auto'} == 1) {
-		# Automatic mode
-		push(@dlvs, { 'name' => 'dnssec-lookaside',
-			      'values' => [ 'auto' ] });
-		}
-	elsif ($in{'dlv_auto'} == 0) {
-		# Listed zones
-		my $dlv;
-		for(my $i=0; defined($in{"anchor_$i"}); $i++) {
-			if (!$in{"anchor_${i}_def"}) {
-				$in{"anchor_$i"} =~ /^[a-z0-9\.\-\_]+$/ ||
-					&error(&text('trusted_eanchor', $i+1));
-				$in{"anchor_$i"} .= "."
-					if ($in{"anchor_$i"} !~ /\.$/);
-				if ($in{"dlv_${i}_def"}) {
-					$dlv = ".";
-					}
-				else {
-					$in{"dlv_$i"} =~ /^[a-z0-9\.\-\_]+$/ ||
-					   &error(&text('trusted_edlv', $i+1));
-					$dlv = $in{"dlv_$i"};
-					$dlv .= "." if ($dlv !~ /\.$/);
-					}
-				push(@dlvs, { 'name' => 'dnssec-lookaside',
-					      'values' => [
-							$dlv, "trust-anchor",
-							$in{"anchor_$i"} ] });
-				}
-			}
-		}
-	elsif ($in{'dlv_auto'} == 2) {
-		# None
-		@dlvs = ( );
-		}
-	&save_directive($options, "dnssec-lookaside", \@dlvs, 1);
-	}
-
 # Save trusted keys
 if (defined($in{'zone_0'})) {
 	my @keys = ( );

system-status/system-status-lib.pl

@@ -74,7 +74,7 @@ if (&foreign_installed("package-updates") && $config{'collect_pkgs'}) {
 	}
 
 # CPU and drive temps
-if (!$config{'collect_notemp'} && defined(&proc::get_current_cpu_data)) {
+if (!$config{'collect_notemp2'} && defined(&proc::get_current_cpu_data)) {
 	my ($cpu, $fans) = &proc::get_current_cpu_data();
 	$info->{'cputemps'} = $cpu if (ref($cpu) && @{$cpu} >= 1);
 	$info->{'cpufans'} = $fans if (ref($fans) && @{$fans} >= 1);

webmin/change_status.cgi

@@ -18,6 +18,7 @@ else {
 
 # Save collection options
 $system_status::config{'collect_pkgs'} = $in{'pkgs'};
+$system_status::config{'collect_notemp2'} = !$in{'temp2'};
 $system_status::config{'collect_notemp'} = !$in{'temp'};
 $system_status::config{'collect_units'} = $in{'units'};
 

webmin/edit_status.cgi

@@ -19,6 +19,10 @@ print &ui_table_row($text{'status_interval'},
 print &ui_table_row($text{'status_pkgs'},
 	&ui_yesno_radio("pkgs", $system_status::config{'collect_pkgs'}));
 
+# Collect CPU temerature?
+print &ui_table_row($text{'status_temp2'},
+	&ui_yesno_radio("temp2", !$system_status::config{'collect_notemp2'}));
+
 # Collect drive temps?
 print &ui_table_row($text{'status_temp'},
 	&ui_yesno_radio("temp", !$system_status::config{'collect_notemp'}));

webmin/lang/en

@@ -1061,6 +1061,7 @@ status_interval0=Every
 status_mins=minutes
 status_pkgs=Collect available package updates?
 status_temp=Collect drive temperatures?
+status_temp2=Collect CPU temperatures and fans speed?
 status_units=Units for temperatures
 status_celsius=Celsius
 status_fahrenheit=Fahrenheit