From 5390cbdfe941f19e146ebbd7587c33c84ac7b318 Mon Sep 17 00:00:00 2001 From: Nicolas LLOBERA Date: Mon, 20 Mar 2017 16:20:07 +0100 Subject: checks if the file exists before trying the command --- libs/system.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs') diff --git a/libs/system.php b/libs/system.php index 702ef3b..ee43722 100644 --- a/libs/system.php +++ b/libs/system.php @@ -6,11 +6,11 @@ date_default_timezone_set(@date_default_timezone_get()); $hostname = php_uname('n'); // OS -if (!($os = shell_exec('/usr/bin/lsb_release -ds | cut -d= -f2 | tr -d \'"\''))) +if (!file_exists('/usr/bin/lsb_release') || !($os = shell_exec('/usr/bin/lsb_release -ds | cut -d= -f2 | tr -d \'"\''))) { - if (!($os = shell_exec('cat /etc/system-release | cut -d= -f2 | tr -d \'"\''))) + if (!file_exists('/etc/system-release') || !($os = shell_exec('cat /etc/system-release | cut -d= -f2 | tr -d \'"\''))) { - if (!($os = shell_exec('cat /etc/os-release | grep PRETTY_NAME | tail -n 1 | cut -d= -f2 | tr -d \'"\''))) + if (!file_exists('/etc/os-release') || !($os = shell_exec('cat /etc/os-release | grep PRETTY_NAME | tail -n 1 | cut -d= -f2 | tr -d \'"\''))) { if (!($os = shell_exec('find /etc/*-release -type f -exec cat {} \; | grep PRETTY_NAME | tail -n 1 | cut -d= -f2 | tr -d \'"\''))) { @@ -72,4 +72,4 @@ $datas = array( 'server_date' => $server_date, ); -echo json_encode($datas); \ No newline at end of file +echo json_encode($datas); -- cgit v1.3 From fffe83f2c73a2928e32c2c70ad788fea9a94d17a Mon Sep 17 00:00:00 2001 From: Nicolas LLOBERA Date: Mon, 20 Mar 2017 17:35:14 +0100 Subject: checks if the file exists before trying the command for the cpu temperature --- libs/cpu.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs') diff --git a/libs/cpu.php b/libs/cpu.php index 9665c87..993e289 100644 --- a/libs/cpu.php +++ b/libs/cpu.php @@ -64,7 +64,7 @@ if ($frequency == 'N.A') // CPU Temp if ($Config->get('cpu:enable_temperature')) { - if (exec('/usr/bin/sensors | grep -E "^(CPU Temp|Core 0)" | cut -d \'+\' -f2 | cut -d \'.\' -f1', $t)) + if (file_exists('/usr/bin/sensors') && exec('/usr/bin/sensors | grep -E "^(CPU Temp|Core 0)" | cut -d \'+\' -f2 | cut -d \'.\' -f1', $t)) { if (isset($t[0])) $temp = $t[0].' °C'; @@ -88,4 +88,4 @@ $datas = array( 'temp' => $temp, ); -echo json_encode($datas); \ No newline at end of file +echo json_encode($datas); -- cgit v1.3