diff options
| -rw-r--r-- | libs/cpu.php | 4 | ||||
| -rw-r--r-- | libs/last_login.php | 4 | ||||
| -rw-r--r-- | libs/system.php | 8 |
3 files changed, 8 insertions, 8 deletions
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); diff --git a/libs/last_login.php b/libs/last_login.php index 4596e44..4a3c8f8 100644 --- a/libs/last_login.php +++ b/libs/last_login.php @@ -7,7 +7,7 @@ $datas = array(); if ($Config->get('last_login:enable')) { - if (!(exec('/usr/bin/lastlog --time 365 | /usr/bin/awk -F\' \' \'{ print $1";"$5, $4, $8, $6}\'', $users))) + if (!(exec('/usr/bin/lastlog --time 365 | awk \'{ printf $1";"; for (i=4; i<NF; i++) printf $i" "; print $NF; }\'', $users))) { $datas[] = array( 'user' => 'N.A', @@ -30,4 +30,4 @@ if ($Config->get('last_login:enable')) } } -echo json_encode($datas);
\ No newline at end of file +echo json_encode($datas); 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); |