diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page index 7c8a485c1..735651786 100644 --- a/emhttp/plugins/dynamix/DashStats.page +++ b/emhttp/plugins/dynamix/DashStats.page @@ -446,16 +446,14 @@ echo ""; _(Name)__(Description)__(Security)__(Streams)_ $share) { - $i++; $list = "$name"; if ($share['luksStatus']>0) $list = str_replace('blue-text','green-text',$list); elseif ($share['useCache']=='only') $list = str_replace('blue-text','orange-text',$list); $comment = $share['comment'] ?: ' '; $security = export_settings(_var($var,'shareSMBEnabled'), $sec[$name]); $last = $name==array_key_last($shares) ? ' last' : ''; - echo "$list$comment$security0"; + echo "$list$comment$security0"; } if (!count($shares)) echo ""._("No shares present").""; } @@ -1532,7 +1530,7 @@ dashboard.on('message',function(msg,meta) { // stream counters (smb only) var tag = $('.smb').is(':visible') ? 'smb' : $('.nfs').is(':visible') ? 'nfs' : ''; - if (tag=='smb') for (var k=1,stream; stream=get.stream[k-1]; k++) $('#share'+k).html(stream); + if (tag=='smb') for (var k=0,stream; stream=get.stream[k]; k++) $('#'+stream[0]).html(stream[1]); break; case 2: diff --git a/emhttp/plugins/dynamix/nchan/update_1 b/emhttp/plugins/dynamix/nchan/update_1 index 859d87715..bdc49a1f6 100755 --- a/emhttp/plugins/dynamix/nchan/update_1 +++ b/emhttp/plugins/dynamix/nchan/update_1 @@ -92,10 +92,10 @@ while (true) { // add fans information if (count($fans)) $echo['fan'] = array_map(function($fan){return "$fan RPM";},$fans); // add streams information - $name = array_keys((array)parse_ini_file("$varroot/shares.ini")); - exec("LANG='en_US.UTF8' lsof -Owl /mnt/disk[0-9]* 2>/dev/null|awk '/^shfs/ && \$0!~/\.AppleD(B|ouble)/ && \$5==\"REG\"'|awk -F/ '{print \$4}'",$lsof); - $counts = array_count_values($lsof); - foreach ($name as $share) $echo['stream'][] = $counts[$share] ?? 0; + $share = array_keys(parse_ini_file("$varroot/shares.ini",true)); + exec("LANG='en_US.UTF8' lsof -Owl /mnt/disk[0-9]* 2>/dev/null|awk -F/ '/^shfs/{print \$4}'",$lsof); + $count = array_count_values($lsof); + foreach ($share as $name) $echo['stream'][] = [$name,$count[$name]??0]; $echo = json_encode($echo); $md5_new = md5($echo,true);