* Mon May 12 2025 Brian Read <brianr@koozali.org> 11.0.0-1.sme
- Adding SM2 panel [SME: 13004] - Upgrade to phpsysinfo 3.4.4 - Add code to delete inline styles and add css to make it look better. - version saved / built uses the static version, which means no drops downs and choices.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/**
|
||||
* lmsensor sensor class
|
||||
* lmsensor sensor class, getting information from lmsensor
|
||||
*
|
||||
* PHP version 5
|
||||
*
|
||||
@@ -8,56 +8,122 @@
|
||||
* @package PSI_Sensor
|
||||
* @author Michael Cramer <BigMichi1@users.sourceforge.net>
|
||||
* @copyright 2009 phpSysInfo
|
||||
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
|
||||
* @version SVN: $Id: class.lmsensors.inc.php 661 2012-08-27 11:26:39Z namiltd $
|
||||
* @link http://phpsysinfo.sourceforge.net
|
||||
*/
|
||||
/**
|
||||
* getting information from lmsensor
|
||||
*
|
||||
* @category PHP
|
||||
* @package PSI_Sensor
|
||||
* @author Michael Cramer <BigMichi1@users.sourceforge.net>
|
||||
* @copyright 2009 phpSysInfo
|
||||
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
|
||||
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License version 2, or (at your option) any later version
|
||||
* @version Release: 3.0
|
||||
* @link http://phpsysinfo.sourceforge.net
|
||||
*/
|
||||
class LMSensors extends Sensors
|
||||
{
|
||||
/**
|
||||
* content to parse
|
||||
* array of values
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
private $_lines = array();
|
||||
private $_values = array();
|
||||
|
||||
/**
|
||||
* fill the private content var through tcp or file access
|
||||
* fill the private content var through command or data access
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
switch (strtolower(PSI_SENSOR_ACCESS)) {
|
||||
$lines = "";
|
||||
if ((PSI_OS == 'Linux') && (!defined('PSI_EMU_HOSTNAME') || defined('PSI_EMU_PORT'))) switch (defined('PSI_SENSOR_LMSENSORS_ACCESS')?strtolower(PSI_SENSOR_LMSENSORS_ACCESS):'command') {
|
||||
case 'command':
|
||||
if (CommonFunctions::executeProgram("sensors", "", $lines)) {
|
||||
// Martijn Stolk: Dirty fix for misinterpreted output of sensors,
|
||||
// where info could come on next line when the label is too long.
|
||||
$lines = str_replace(":\n", ":", $lines);
|
||||
$lines = str_replace("\n\n", "\n", $lines);
|
||||
$this->_lines = preg_split("/\n/", $lines, -1, PREG_SPLIT_NO_EMPTY);
|
||||
}
|
||||
CommonFunctions::executeProgram("sensors", "", $lines);
|
||||
break;
|
||||
case 'file':
|
||||
if (CommonFunctions::rfts(APP_ROOT.'/data/lmsensors.txt', $lines)) {
|
||||
$lines = str_replace(":\n", ":", $lines);
|
||||
$lines = str_replace("\n\n", "\n", $lines);
|
||||
$this->_lines = preg_split("/\n/", $lines, -1, PREG_SPLIT_NO_EMPTY);
|
||||
case 'data':
|
||||
if (!defined('PSI_EMU_PORT')) {
|
||||
CommonFunctions::rftsdata('lmsensors.tmp', $lines);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
$this->error->addConfigError('__construct()', 'PSI_SENSOR_ACCESS');
|
||||
break;
|
||||
$this->error->addConfigError('__construct()', '[sensor_lmsensors] ACCESS');
|
||||
}
|
||||
|
||||
if (trim($lines) !== "") {
|
||||
$lines = str_replace("\r\n", "\n", $lines);
|
||||
$lines = str_replace(":\n", ":", $lines);
|
||||
$lines = str_replace("\n\n", "\n", $lines);
|
||||
$lines = preg_replace("/\n\s+\(/m", " (", $lines);
|
||||
$_lines = preg_split("/\n/", $lines, -1, PREG_SPLIT_NO_EMPTY);
|
||||
|
||||
$applearray1 = array(
|
||||
"A" => "Ambient",
|
||||
"B" => "Battery",
|
||||
"C" => "CPU",
|
||||
"G" => "GPU",
|
||||
"H" => "Harddisk Bay",
|
||||
"h" => "Heatpipe",
|
||||
"L" => "LCD",
|
||||
"M" => "Memory",
|
||||
"m" => "Memory Contr.",
|
||||
"N" => "Northbridge",
|
||||
"O" => "Optical Drive",
|
||||
"p" => "Power supply",
|
||||
"S" => "Slot",
|
||||
"s" => "Slot",
|
||||
"W" => "Airport"
|
||||
);
|
||||
$applearray3 = array(
|
||||
"H" => "Heatsink",
|
||||
"P" => "Proximity",
|
||||
"D" => "Die"
|
||||
);
|
||||
|
||||
$tmpvalue=array();
|
||||
$applesmc = false;
|
||||
$sname = '';
|
||||
foreach ($_lines as $line) {
|
||||
if ((trim($line) !== "") && (strpos($line, ':') === false)) {
|
||||
if (sizeof($tmpvalue)>0) {
|
||||
$this->_values[] = $tmpvalue;
|
||||
$tmpvalue = array();
|
||||
}
|
||||
$sname = trim($line);
|
||||
$applesmc = ($sname === "applesmc-isa-0300");
|
||||
if (preg_match('/^([^-]+)-/', $sname, $snamebuf)) {
|
||||
$sname = $snamebuf[1];
|
||||
} else {
|
||||
$sname = '';
|
||||
}
|
||||
} else {
|
||||
if (preg_match("/^(.+):(.+)$/", trim($line), $data) && ($data[1]!=="Adapter")) {
|
||||
if ($applesmc && (strlen($data[1]) == 4) && ($data[1][0] == "T")) {
|
||||
if (isset($applearray1[$data[1][1]])) $data[1] .= " ".$applearray1[$data[1][1]];
|
||||
if (isset($applearray3[$data[1][3]])) $data[1] .= " ".$applearray3[$data[1][3]];
|
||||
}
|
||||
|
||||
$arrtemp=array();
|
||||
if ($sname !== "" ) {
|
||||
$arrtemp["name"] = $data[1]." (".$sname.")";
|
||||
} else {
|
||||
$arrtemp["name"] = $data[1];
|
||||
}
|
||||
if (preg_match("/^([^\(]+)\s+\(/", $data[2], $tmp) || preg_match("/^(.+)\s+ALARM$/", $data[2], $tmp)) {
|
||||
if (($tmp[1] = trim($tmp[1])) == "") {
|
||||
$arrtemp["value"] = "ALARM";
|
||||
} else {
|
||||
$arrtemp["value"] = $tmp[1];
|
||||
}
|
||||
if (preg_match("/\s(ALARM)\s*$/", $data[2]) || preg_match("/\s(ALARM)\s+\(/", $data[2]) || preg_match("/\s(ALARM)\s+sensor\s+=/", $data[2])) {
|
||||
$arrtemp["alarm"]="ALARM";
|
||||
}
|
||||
|
||||
if (preg_match_all("/\(([^\)]+\s+=\s+[^\)]+)\)/", $data[2], $tmp2)) foreach ($tmp2[1] as $tmp3) {
|
||||
$arrtmp3 = preg_split('/,/', $tmp3);
|
||||
foreach ($arrtmp3 as $tmp4) if (preg_match("/^(\S+)\s+=\s+(.*)$/", trim($tmp4), $tmp5)) {
|
||||
$arrtemp[$tmp5[1]]=trim($tmp5[2]);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$arrtemp["value"] = trim($data[2]);
|
||||
}
|
||||
$tmpvalue[] = $arrtemp;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (sizeof($tmpvalue)>0) $this->_values[] = $tmpvalue;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,88 +134,35 @@ class LMSensors extends Sensors
|
||||
*/
|
||||
private function _temperature()
|
||||
{
|
||||
$ar_buf = array();
|
||||
foreach ($this->_lines as $line) {
|
||||
$data = array();
|
||||
if (preg_match("/(.*):(.*)\((.*)=(.*),(.*)=(.*)\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*)\((.*)=(.*)\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} else {
|
||||
preg_match("/(.*):(.*)/", $line, $data);
|
||||
}
|
||||
if (count($data) > 1) {
|
||||
$temp = substr(trim($data[2]), -1);
|
||||
switch ($temp) {
|
||||
case "C":
|
||||
// case "F":
|
||||
array_push($ar_buf, $line);
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach ($ar_buf as $line) {
|
||||
$data = array();
|
||||
if (preg_match("/(.*):(.*).C[ ]*\((.*)=(.*).C,(.*)=(.*).C\)(.*)\)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*).C[ ]*\((.*)=(.*).C,(.*)=(.*).C\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*).C[ ]*\((.*)=(.*).C\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*).C[ \t]+/", $line, $data)) {
|
||||
;
|
||||
} else {
|
||||
preg_match("/(.*):(.*).C$/", $line, $data);
|
||||
}
|
||||
foreach ($data as $key=>$value) {
|
||||
if (preg_match("/^\+?(-?[0-9\.]+).?$/", trim($value), $newvalue)) {
|
||||
$data[$key] = 0+trim($newvalue[1]);
|
||||
} else {
|
||||
$data[$key] = trim($value);
|
||||
}
|
||||
}
|
||||
$dev = new SensorDevice();
|
||||
|
||||
if (strlen($data[1]) == 4) {
|
||||
if ($data[1][0] == "T") {
|
||||
|
||||
if ($data[1][1] == "A") {
|
||||
$data[1] = $data[1] . " Ambient";
|
||||
} elseif ($data[1][1] == "C") {
|
||||
$data[1] = $data[1] . " CPU";
|
||||
} elseif ($data[1][1] == "G") {
|
||||
$data[1] = $data[1] . " GPU";
|
||||
} elseif ($data[1][1] == "H") {
|
||||
$data[1] = $data[1] . " Harddisk";
|
||||
} elseif ($data[1][1] == "L") {
|
||||
$data[1] = $data[1] . " LCD";
|
||||
} elseif ($data[1][1] == "O") {
|
||||
$data[1] = $data[1] . " ODD";
|
||||
} elseif ($data[1][1] == "B") {
|
||||
$data[1] = $data[1] . " Battery";
|
||||
foreach ($this->_values as $sensors) foreach ($sensors as $sensor){
|
||||
if (isset($sensor["value"])) {
|
||||
$limit = "";
|
||||
if (preg_match("/^\+?(-?[\d\.]+)[^\w\r\n\t]+C$/", $sensor["value"], $tmpbuf) ||
|
||||
((isset($sensor[$limit="crit"]) || isset($sensor[$limit="high"]) || isset($sensor[$limit="hyst"])) && preg_match("/^\+?(-?[\d\.]+)[^\w\r\n\t]+C$/", $sensor[$limit]))) {
|
||||
$dev = new SensorDevice();
|
||||
$dev->setName($sensor["name"]);
|
||||
if ($limit != "") {
|
||||
$dev->setValue($sensor["value"]);
|
||||
$dev->setEvent("FAULT");
|
||||
} else {
|
||||
if ($tmpbuf[1] == -110.8) {
|
||||
$dev->setValue("FAULT");
|
||||
$dev->setEvent("FAULT");
|
||||
} else {
|
||||
$dev->setValue(floatval($tmpbuf[1]));
|
||||
if (isset($sensor["alarm"])) $dev->setEvent("ALARM");
|
||||
}
|
||||
}
|
||||
|
||||
if ($data[1][3] == "H") {
|
||||
$data[1] = $data[1] . " Heatsink";
|
||||
} elseif ($data[1][3] == "P") {
|
||||
$data[1] = $data[1] . " Proximity";
|
||||
} elseif ($data[1][3] == "D") {
|
||||
$data[1] = $data[1] . " Die";
|
||||
if (isset($sensor[$limit="crit"]) && preg_match("/^\+?(-?[\d\.]+)[^\w\r\n\t]+C$/", $sensor[$limit], $tmpbuf) && (($tmpbuf[1]=floatval($tmpbuf[1])) > 0)) {
|
||||
$dev->setMax(floatval($tmpbuf[1]));
|
||||
} elseif (isset($sensor[$limit="high"]) && preg_match("/^\+?(-?[\d\.]+)[^\w\r\n\t]+C$/", $sensor[$limit], $tmpbuf) && (($tmpbuf[1]=floatval($tmpbuf[1])) > 0) && ($tmpbuf[1]<65261.8)) {
|
||||
$dev->setMax(floatval($tmpbuf[1]));
|
||||
}
|
||||
|
||||
$this->mbinfo->setMbTemp($dev);
|
||||
}
|
||||
}
|
||||
|
||||
$dev->setName($data[1]);
|
||||
$dev->setValue($data[2]);
|
||||
|
||||
if (isset($data[6]) && $data[2] <= $data[6]) {
|
||||
$dev->setMax(max($data[4], $data[6]));
|
||||
} elseif (isset($data[4]) && $data[2] <= $data[4]) {
|
||||
$dev->setMax($data[4]);
|
||||
}
|
||||
if (preg_match("/\sALARM(\s*)$/", $line)) {
|
||||
$dev->setEvent("Alarm");
|
||||
}
|
||||
$this->mbinfo->setMbTemp($dev);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -160,50 +173,32 @@ class LMSensors extends Sensors
|
||||
*/
|
||||
private function _fans()
|
||||
{
|
||||
$ar_buf = array();
|
||||
foreach ($this->_lines as $line) {
|
||||
$data = array();
|
||||
if (preg_match("/(.*):(.*)\((.*)=(.*),(.*)=(.*)\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*)\((.*)=(.*)\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} else {
|
||||
preg_match("/(.*):(.*)/", $line, $data);
|
||||
}
|
||||
if (count($data) > 1) {
|
||||
$temp = substr(trim($data[2]), -4);
|
||||
switch ($temp) {
|
||||
case " RPM":
|
||||
array_push($ar_buf, $line);
|
||||
foreach ($this->_values as $sensors) foreach ($sensors as $sensor){
|
||||
if (isset($sensor["value"])) {
|
||||
$limit = "";
|
||||
if (preg_match("/^(\d+) RPM$/", $sensor["value"], $tmpbuf) ||
|
||||
((isset($sensor[$limit="min"]) || isset($sensor[$limit="max"])) && preg_match("/^(\d+) RPM$/", $sensor[$limit]))) {
|
||||
$dev = new SensorDevice();
|
||||
$dev->setName($sensor["name"]);
|
||||
if ($limit != "") {
|
||||
$dev->setValue($sensor["value"]);
|
||||
$dev->setEvent("FAULT");
|
||||
} else {
|
||||
$dev->setValue($tmpbuf[1]);
|
||||
}
|
||||
if (isset($sensor["alarm"])) $dev->setEvent("ALARM");
|
||||
|
||||
if (isset($sensor[$limit="min"]) && preg_match("/^(\d+) RPM$/", $sensor[$limit], $tmpbuf) && ($tmpbuf[1] > 0)) {
|
||||
$dev->setMin($tmpbuf[1]);
|
||||
}
|
||||
|
||||
$this->mbinfo->setMbFan($dev);
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach ($ar_buf as $line) {
|
||||
$data = array();
|
||||
if (preg_match("/(.*):(.*) RPM[ ]*\((.*)=(.*) RPM,(.*)=(.*)\)(.*)\)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*) RPM[ ]*\((.*)=(.*) RPM,(.*)=(.*)\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*) RPM[ ]*\((.*)=(.*) RPM\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*) RPM[ \t]+/", $line, $data)) {
|
||||
;
|
||||
} else {
|
||||
preg_match("/(.*):(.*) RPM$/", $line, $data);
|
||||
}
|
||||
$dev = new SensorDevice();
|
||||
$dev->setName(trim($data[1]));
|
||||
$dev->setValue(trim($data[2]));
|
||||
if (isset($data[4])) {
|
||||
$dev->setMin(trim($data[4]));
|
||||
}
|
||||
if (preg_match("/\sALARM(\s*)$/", $line)) {
|
||||
$dev->setEvent("Alarm");
|
||||
}
|
||||
$this->mbinfo->setMbFan($dev);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* get voltage information
|
||||
*
|
||||
@@ -211,58 +206,37 @@ class LMSensors extends Sensors
|
||||
*/
|
||||
private function _voltage()
|
||||
{
|
||||
$ar_buf = array();
|
||||
foreach ($this->_lines as $line) {
|
||||
$data = array();
|
||||
if (preg_match("/(.*):(.*)\((.*)=(.*),(.*)=(.*)\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*)\(/", $line, $data)) {
|
||||
;
|
||||
} else {
|
||||
preg_match("/(.*):(.*)/", $line, $data);
|
||||
}
|
||||
if (count($data) > 1) {
|
||||
$temp = substr(trim($data[2]), -2);
|
||||
switch ($temp) {
|
||||
case " V":
|
||||
array_push($ar_buf, $line);
|
||||
foreach ($this->_values as $sensors) foreach ($sensors as $sensor){
|
||||
if (isset($sensor["value"])) {
|
||||
$limit = "";
|
||||
if (preg_match("/^\+?(-?[\d\.]+) (m?)V$/", $sensor["value"], $tmpbuf) ||
|
||||
((isset($sensor[$limit="min"]) || isset($sensor[$limit="max"])) && preg_match("/^\+?(-?[\d\.]+) (m?)V$/", $sensor[$limit]))) {
|
||||
$dev = new SensorDevice();
|
||||
$dev->setName($sensor["name"]);
|
||||
if ($limit != "") {
|
||||
$dev->setValue($sensor["value"]);
|
||||
$dev->setEvent("FAULT");
|
||||
} else {
|
||||
if ($tmpbuf[2] == "m") {
|
||||
$dev->setValue(floatval($tmpbuf[1])/1000);
|
||||
} else {
|
||||
$dev->setValue(floatval($tmpbuf[1]));
|
||||
}
|
||||
}
|
||||
if (isset($sensor["alarm"])) $dev->setEvent("ALARM");
|
||||
|
||||
if (isset($sensor[$limit="min"]) && preg_match("/^\+?(-?[\d\.]+) (m?)V$/", $sensor[$limit], $tmpbuf)) {
|
||||
$dev->setMin(floatval($tmpbuf[1]));
|
||||
}
|
||||
|
||||
if (isset($sensor[$limit="max"]) && preg_match("/^\+?(-?[\d\.]+) (m?)V$/", $sensor[$limit], $tmpbuf)) {
|
||||
$dev->setMax(floatval($tmpbuf[1]));
|
||||
}
|
||||
|
||||
$this->mbinfo->setMbVolt($dev);
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach ($ar_buf as $line) {
|
||||
$data = array();
|
||||
if (preg_match("/(.*):(.*) V[ ]*\((.*)=(.*) V,(.*)=(.*) V\)(.*)\)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*) V[ ]*\((.*)=(.*) V,(.*)=(.*) V\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*) V[ \t]+/", $line, $data)) {
|
||||
;
|
||||
} else {
|
||||
preg_match("/(.*):(.*) V$/", $line, $data);
|
||||
}
|
||||
foreach ($data as $key=>$value) {
|
||||
if (preg_match("/^\+?(-?[0-9\.]+)$/", trim($value), $newvalue)) {
|
||||
$data[$key] = 0+trim($newvalue[1]);
|
||||
} else {
|
||||
$data[$key] = trim($value);
|
||||
}
|
||||
}
|
||||
if (isset($data[1])) {
|
||||
$dev = new SensorDevice();
|
||||
$dev->setName($data[1]);
|
||||
$dev->setValue($data[2]);
|
||||
if (isset($data[4])) {
|
||||
$dev->setMin($data[4]);
|
||||
}
|
||||
if (isset($data[6])) {
|
||||
$dev->setMax($data[6]);
|
||||
}
|
||||
if (preg_match("/\sALARM(\s*)$/", $line)) {
|
||||
$dev->setEvent("Alarm");
|
||||
}
|
||||
$this->mbinfo->setMbVolt($dev);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -272,63 +246,32 @@ class LMSensors extends Sensors
|
||||
*/
|
||||
private function _power()
|
||||
{
|
||||
$ar_buf = array();
|
||||
foreach ($this->_lines as $line) {
|
||||
$data = array();
|
||||
if (preg_match("/(.*):(.*)\((.*)=(.*),(.*)=(.*)\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*)\((.*)=(.*)\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} else {
|
||||
preg_match("/(.*):(.*)/", $line, $data);
|
||||
}
|
||||
if (count($data) > 1) {
|
||||
$temp = substr(trim($data[2]), -2);
|
||||
switch ($temp) {
|
||||
case " W":
|
||||
array_push($ar_buf, $line);
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach ($ar_buf as $line) {
|
||||
$data = array();
|
||||
/* not tested yet
|
||||
if (preg_match("/(.*):(.*) W[ ]*\((.*)=(.*) W,(.*)=(.*) W\)(.*)\)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*) W[ ]*\((.*)=(.*) W,(.*)=(.*) W\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} else
|
||||
*/
|
||||
if (preg_match("/(.*):(.*) W[ ]*\((.*)=(.*) W\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*) W[ \t]+/", $line, $data)) {
|
||||
;
|
||||
} else {
|
||||
preg_match("/(.*):(.*) W$/", $line, $data);
|
||||
}
|
||||
foreach ($data as $key=>$value) {
|
||||
if (preg_match("/^\+?([0-9\.]+).?$/", trim($value), $newvalue)) {
|
||||
$data[$key] = trim($newvalue[1]);
|
||||
} else {
|
||||
$data[$key] = trim($value);
|
||||
}
|
||||
}
|
||||
$dev = new SensorDevice();
|
||||
$dev->setName($data[1]);
|
||||
$dev->setValue($data[2]);
|
||||
foreach ($this->_values as $sensors) foreach ($sensors as $sensor){
|
||||
if (isset($sensor["value"])) {
|
||||
$limit = "";
|
||||
if (preg_match("/^\+?(-?[\d\.]+) W$/", $sensor["value"], $tmpbuf) ||
|
||||
(isset($sensor[$limit="crit"]) && preg_match("/^\+?(-?[\d\.]+) W$/", $sensor[$limit]))) {
|
||||
$dev = new SensorDevice();
|
||||
$dev->setName($sensor["name"]);
|
||||
if ($limit != "") {
|
||||
$dev->setValue($sensor["value"]);
|
||||
$dev->setEvent("FAULT");
|
||||
} else {
|
||||
$dev->setValue(floatval($tmpbuf[1]));
|
||||
}
|
||||
if (isset($sensor["alarm"])) $dev->setEvent("ALARM");
|
||||
|
||||
if (isset($data[6]) && $data[2] <= $data[6]) {
|
||||
$dev->setMax(max($data[4], $data[6]));
|
||||
} elseif (isset($data[4]) && $data[2] <= $data[4]) {
|
||||
$dev->setMax($data[4]);
|
||||
if (isset($sensor[$limit="crit"]) && preg_match("/^\+?(-?[\d\.]+) W$/", $sensor[$limit], $tmpbuf)) {
|
||||
$dev->setMax(floatval($tmpbuf[1]));
|
||||
}
|
||||
|
||||
$this->mbinfo->setMbPower($dev);
|
||||
}
|
||||
}
|
||||
if (preg_match("/\sALARM(\s*)$/", $line)) {
|
||||
$dev->setEvent("Alarm");
|
||||
}
|
||||
$this->mbinfo->setMbPower($dev);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* get current information
|
||||
*
|
||||
@@ -336,60 +279,54 @@ class LMSensors extends Sensors
|
||||
*/
|
||||
private function _current()
|
||||
{
|
||||
$ar_buf = array();
|
||||
foreach ($this->_lines as $line) {
|
||||
$data = array();
|
||||
if (preg_match("/(.*):(.*)\((.*)=(.*),(.*)=(.*)\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*)\((.*)=(.*)\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} else {
|
||||
preg_match("/(.*):(.*)/", $line, $data);
|
||||
}
|
||||
if (count($data) > 1) {
|
||||
$temp = substr(trim($data[2]), -2);
|
||||
switch ($temp) {
|
||||
case " A":
|
||||
array_push($ar_buf, $line);
|
||||
foreach ($this->_values as $sensors) foreach ($sensors as $sensor){
|
||||
if (isset($sensor["value"])) {
|
||||
$limit = "";
|
||||
if (preg_match("/^\+?(-?[\d\.]+) A$/", $sensor["value"], $tmpbuf) ||
|
||||
(isset($sensor[$limit="crit"]) && preg_match("/^\+?(-?[\d\.]+) A$/", $sensor[$limit]))) {
|
||||
$dev = new SensorDevice();
|
||||
$dev->setName($sensor["name"]);
|
||||
if ($limit != "") {
|
||||
$dev->setValue($sensor["value"]);
|
||||
$dev->setEvent("FAULT");
|
||||
} else {
|
||||
$dev->setValue(floatval($tmpbuf[1]));
|
||||
}
|
||||
if (isset($sensor["alarm"])) $dev->setEvent("ALARM");
|
||||
|
||||
if (isset($sensor[$limit="min"]) && preg_match("/^\+?(-?[\d\.]+) A$/", $sensor[$limit], $tmpbuf)) {
|
||||
$dev->setMin(floatval($tmpbuf[1]));
|
||||
}
|
||||
|
||||
if (isset($sensor[$limit="max"]) && preg_match("/^\+?(-?[\d\.]+) A$/", $sensor[$limit], $tmpbuf)) {
|
||||
$dev->setMax(floatval($tmpbuf[1]));
|
||||
}
|
||||
|
||||
$this->mbinfo->setMbCurrent($dev);
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach ($ar_buf as $line) {
|
||||
$data = array();
|
||||
/* not tested yet
|
||||
if (preg_match("/(.*):(.*) A[ ]*\((.*)=(.*) A,(.*)=(.*) A\)(.*)\)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*) A[ ]*\((.*)=(.*) A,(.*)=(.*) A\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} else
|
||||
*/
|
||||
if (preg_match("/(.*):(.*) A[ ]*\((.*)=(.*) A\)(.*)/", $line, $data)) {
|
||||
;
|
||||
} elseif (preg_match("/(.*):(.*) A[ \t]+/", $line, $data)) {
|
||||
;
|
||||
} else {
|
||||
preg_match("/(.*):(.*) A$/", $line, $data);
|
||||
}
|
||||
foreach ($data as $key=>$value) {
|
||||
if (preg_match("/^\+?([0-9\.]+).?$/", trim($value), $newvalue)) {
|
||||
$data[$key] = trim($newvalue[1]);
|
||||
} else {
|
||||
$data[$key] = trim($value);
|
||||
}
|
||||
|
||||
/**
|
||||
* get other information
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
private function _other()
|
||||
{
|
||||
foreach ($this->_values as $sensors) foreach ($sensors as $sensor){
|
||||
if (isset($sensor["value"])) {
|
||||
if ((preg_match("/^[^\-\+\d]/", $sensor["value"]) || preg_match("/^\d+$/", $sensor["value"])) && ($sensor["value"] !== 'failed') &&
|
||||
!isset($sensor[$limit="min"]) && !isset($sensor[$limit="max"]) && !isset($sensor[$limit="crit"]) && !isset($sensor[$limit="high"]) && !isset($sensor[$limit="hyst"])) {
|
||||
$dev = new SensorDevice();
|
||||
$dev->setName($sensor["name"]);
|
||||
$dev->setValue($sensor["value"]);
|
||||
if (isset($sensor["alarm"])) $dev->setEvent("ALARM");
|
||||
|
||||
$this->mbinfo->setMbOther($dev);
|
||||
}
|
||||
}
|
||||
$dev = new SensorDevice();
|
||||
$dev->setName($data[1]);
|
||||
$dev->setValue($data[2]);
|
||||
|
||||
if (isset($data[6]) && $data[2] <= $data[6]) {
|
||||
$dev->setMax(max($data[4], $data[6]));
|
||||
} elseif (isset($data[4]) && $data[2] <= $data[4]) {
|
||||
$dev->setMax($data[4]);
|
||||
}
|
||||
if (preg_match("/\sALARM(\s*)$/", $line)) {
|
||||
$dev->setEvent("Alarm");
|
||||
}
|
||||
$this->mbinfo->setMbCurrent($dev);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -398,14 +335,15 @@ class LMSensors extends Sensors
|
||||
*
|
||||
* @see PSI_Interface_Sensor::build()
|
||||
*
|
||||
* @return Void
|
||||
* @return void
|
||||
*/
|
||||
public function build()
|
||||
{
|
||||
$this->_temperature();
|
||||
$this->_voltage();
|
||||
$this->_fans();
|
||||
$this->_voltage();
|
||||
$this->_power();
|
||||
$this->_current();
|
||||
$this->_other();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user