mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-02-23 02:39:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix PHP8 errors

Browse Source
This commit is contained in:
bergware
2023-11-28 14:30:44 +01:00
parent 9a8fe9d80b
commit 02fe880652
2 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
emhttp/plugins/dynamix/include/Helpers.php
View File

@@ -265,35 +265,36 @@ function delete_file(...$file) {
array_map('unlink',array_filter($file,'file_exists'));
}
function getnvmepowerstate($device) {
$array=[] ;
exec("nvme id-ctrl $device |grep -E 'ps |wctemp|cctemp'",$array,$error) ;
foreach ($array as $line){
$split = explode(":",$line) ;
$check=str_replace(" ","",trim($split[0]));
switch($check){
case "wctemp":
$return['wctemp'] = $split[1] - 273;
break;
case "cctemp":
$return['cctemp'] = $split[1] - 273;
break;
case "ps0":
case "ps1":
case "ps2":
case "ps3":
case "ps4":
case "ps5":
$power = explode(" ",$split[2]) ;
$return[$check] = $power[0];
break;
}
if (!exec("which nvme 2>/dev/null")) return;
exec("nvme id-ctrl $device | grep -E 'ps |wctemp|cctemp'",$rows);
foreach ($rows as $row){
if (!$row) continue;
$split = explode(':',$row);
$check = str_replace(' ','',trim($split[0]));
switch ($check){
case "wctemp":
$return['wctemp'] = $split[1] - 273;
break;
case "cctemp":
$return['cctemp'] = $split[1] - 273;
break;
case "ps0":
case "ps1":
case "ps2":
case "ps3":
case "ps4":
case "ps5":
$power = explode(' ',$split[2]);
$return[$check] = $power[0];
break;
}
}
$powerstate = shell_exec("nvme get-feature $device -f 02");
$powersplit = explode(":",$powerstate) ;
$powerstate = substr(trim($powersplit[2]), -1) ;
#get-feature:0x02 (Power Management), Current value:0x00000003)
$return["powerstate"] = $powerstate;
$return["powerstatevalue"] = $return['ps'.$return['powerstate']] ;
$powersplit = explode(':',$powerstate);
$powerstate = substr(trim($powersplit[2]),-1);
# get-feature:0x02 (Power Management), Current value:0x00000003)
$return['powerstate'] = $powerstate;
$return['powerstatevalue'] = $return['ps'.$return['powerstate']];
return $return;
}
?>

9
emhttp/plugins/dynamix/nchan/device_list
View File

@@ -276,10 +276,11 @@ function array_online(&$disk, $fstype='') {
default:
$echo[] = "<td>".device_info($disk,true)."</td>";
$echo[] = "<td>".device_desc($disk)."</td>";
if ($disk['transport'] == "nvme") {
$powerstate=getnvmepowerstate("/dev/".$disk['device']);
$powerstatevalue="<br>PS: ".$powerstate['powerstatevalue']."(".$powerstate['powerstate'].")" ;
} else $powerstatevalue = "" ;
$powerstatevalue = "";
if (_var($disk,'transport') == 'nvme') {
$powerstate = getnvmepowerstate("/dev/"._var($disk,'device'));
$powerstatevalue = '<br>'._('PS').': '._var($powerstate,'powerstatevalue','?').'('._var($powerstate,'powerstate','--').')';
}
$echo[] = "<td>".my_temp(_var($disk,'temp','*')).$powerstatevalue."</td>";
$echo[] = "<td><span class='diskio'>".my_diskio($data[0])."</span><span class='number'>".my_number(_var($disk,'numReads',0))."</span></td>";
$echo[] = "<td><span class='diskio'>".my_diskio($data[1])."</span><span class='number'>".my_number(_var($disk,'numWrites',0))."</span></td>";