From cb7e6a306893716e7144e5deae63c7b01b2d8fec Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 15 Nov 2016 12:20:32 +0100 Subject: [PATCH 1/4] Display CPU temperature in Fahrenheit if corresponding flag is set in setupVars.conf --- header.php | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/header.php b/header.php index bc31aa9e..0dc1c170 100644 --- a/header.php +++ b/header.php @@ -10,7 +10,9 @@ } $cmd = "echo $((`cat /sys/class/thermal/thermal_zone0/temp | cut -c1-2`))"; $output = shell_exec($cmd); - $output = str_replace(array("\r\n","\r","\n"),"", $output); + $celsius = str_replace(array("\r\n","\r","\n"),"", $output); + $fahrenheit = str_replace(["\r\n","\r","\n"],"", $output*9./5)+32; + $temperatureunit = parse_ini_file("/etc/pihole/setupVars.conf")['temperatureunit']; ?> @@ -148,11 +150,20 @@ } // CPU Temp - if ($output > "45") { - echo ' Temp: ' . $output . ''; - } else { - echo ' Temp: ' . $output . ''; + echo ' Temp: '; + if($temperatureunit != "F") + echo $celsius . '°C'; + else + echo $fahrenheit . '°F'; + echo ''; ?> From 2c3682c98792a7c63bd259e406b7e2654b4d5c7a Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 15 Nov 2016 12:25:54 +0100 Subject: [PATCH 2/4] Round Fahrenheit temperature since the impression could arise that the temperature would be more accurate than it acutally is. --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index 0dc1c170..fd6e020d 100644 --- a/header.php +++ b/header.php @@ -11,7 +11,7 @@ $cmd = "echo $((`cat /sys/class/thermal/thermal_zone0/temp | cut -c1-2`))"; $output = shell_exec($cmd); $celsius = str_replace(array("\r\n","\r","\n"),"", $output); - $fahrenheit = str_replace(["\r\n","\r","\n"],"", $output*9./5)+32; + $fahrenheit = round(str_replace(["\r\n","\r","\n"],"", $output*9./5)+32); $temperatureunit = parse_ini_file("/etc/pihole/setupVars.conf")['temperatureunit']; ?> From 894ae02b949d6673d7d2d0b283c797576501d968 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 16 Nov 2016 21:32:48 +0000 Subject: [PATCH 3/4] Update data.php Reflect var name changes in development branch of pihole --- data.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data.php b/data.php index 88c26a86..29a49a6a 100644 --- a/data.php +++ b/data.php @@ -1,6 +1,6 @@ Date: Wed, 16 Nov 2016 22:32:48 +0100 Subject: [PATCH 4/4] Capitalized variable name --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index fd6e020d..bf871011 100644 --- a/header.php +++ b/header.php @@ -12,7 +12,7 @@ $output = shell_exec($cmd); $celsius = str_replace(array("\r\n","\r","\n"),"", $output); $fahrenheit = round(str_replace(["\r\n","\r","\n"],"", $output*9./5)+32); - $temperatureunit = parse_ini_file("/etc/pihole/setupVars.conf")['temperatureunit']; + $temperatureunit = parse_ini_file("/etc/pihole/setupVars.conf")['TEMPERATUREUNIT']; ?>