From 76757b5cf0d3076fd1ff3af1691b60371f252011 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 13:07:48 +0100
Subject: [PATCH] Fixes for ZFS subpools

---
 emhttp/plugins/dynamix/ArrayDevices.page       |  4 ++--
 emhttp/plugins/dynamix/CacheDevices.page       |  2 +-
 emhttp/plugins/dynamix/DashStats.page          |  2 +-
 emhttp/plugins/dynamix/DeviceInfo.page         |  4 ++--
 emhttp/plugins/dynamix/include/ToggleState.php |  2 +-
 emhttp/plugins/dynamix/include/Wrappers.php    | 14 +++++++-------
 emhttp/plugins/dynamix/nchan/device_list       | 14 +++++++-------
 emhttp/plugins/dynamix/nchan/update_2          |  6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/emhttp/plugins/dynamix/ArrayDevices.page b/emhttp/plugins/dynamix/ArrayDevices.page
index 4d6427f4f..e50d96245 100644
--- a/emhttp/plugins/dynamix/ArrayDevices.page
+++ b/emhttp/plugins/dynamix/ArrayDevices.page
@@ -15,8 +15,8 @@ Tag="database"
  */
 ?>
 <script>
-String.prototype.no_tilde = function(){return this.replace('<?=$tilde?>','<?=$proxy?>');}
-String.prototype.master = function(){return this.split('<?=$tilde?>')[0];}
+String.prototype.no_tilde = function(){return this.replace('<?=$tilde_?>','<?=$proxy_?>');}
+String.prototype.master = function(){return this.split('<?=$tilde_?>')[0];}
 
 function toggle_state(device,name,action) {
   var button = null;
diff --git a/emhttp/plugins/dynamix/CacheDevices.page b/emhttp/plugins/dynamix/CacheDevices.page
index a373aa65f..51ce7578e 100644
--- a/emhttp/plugins/dynamix/CacheDevices.page
+++ b/emhttp/plugins/dynamix/CacheDevices.page
@@ -115,7 +115,7 @@ function addSubpoolPopup(poolname,currentsubpools) {
     buttons: {
     "_(Add)_": function() {
         subpool=$(this).find('select[name="subpool"]').val();
-        $(this).find('input[name="poolName"]').val(poolname + '<?=$tilde?>' + subpool);
+        $(this).find('input[name="poolName"]').val(poolname + '<?=$tilde_?>' + subpool);
         $(this).find('form').submit();
         $(this).dialog('close');
       },
diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 686d39d56..466e6b9bf 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -570,7 +570,7 @@ if (!$group) {
 <?$i=0?>
 <?foreach ($pools as $pool):?>
 <tbody id='pool_list<?=$i?>' title="_(<?=ucfirst($pool)?> Information)_">
-<tr><td><i class='icon-disk f32'></i><div class='section'><?=ucfirst(str_replace($tilde," $arrow ",$pool))?><?if (!$started):?> (_(stopped)_)<?endif;?><br>
+<tr><td><i class='icon-disk f32'></i><div class='section'><?=ucfirst(str_replace($tilde_," $arrow_ ",$pool))?><?if (!$started):?> (_(stopped)_)<?endif;?><br>
 <span><?if ($started):?><?=sprintf(_("%s used of %s (%s %%)"),my_scale($cache_used[$pool]*1024,$unit)." $unit",my_scale($cache_size[$pool]*1024,$unit,-1,-1)." $unit",$cache_rate[$pool])?><?endif;?></span><br></div>
 <a href='/Dashboard/Settings/Device?name=<?=$pool?>' title="_(Go to disk settings)_"><i class='fa fa-fw fa-cog control'></i></a>
 </td></tr>
diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index a11bb5adc..4f21a7cf3 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -537,7 +537,7 @@ _(Name)_:
 
 <?else:?>
 _(Name)_:
-: <?=str_replace($tilde," $arrow ",_(my_disk($name),3))?>
+: <?=str_replace($tilde_," $arrow_ ",_(my_disk($name),3))?>
 
 <?endif;?>
 <?if (diskStatus('_NP')):?>
@@ -726,7 +726,7 @@ _(Critical disk utilization threshold)_ (%):
     <?if (_var($var,'fsState')=="Started" && _var($var,'startMode')!="Normal" && diskType('Data')): $erasable=true; endif;?>
     <input type="button" id="eraseButton" value="_(Erase)_" onclick="eraseDisk('<?=$name?>')"<?=$erasable?'':' disabled'?>>
   <?endif;?>
-  <?if (isPool($name) && strpos($name,$tilde)===false):?>
+  <?if (isPool($name) && strpos($name,$tilde_)===false):?>
     <?if (_var($var,'fsState')=="Stopped" || (_var($var,'fsState')=="Started" && _var($var,'startMode')!="Normal")): $erasable=true; endif;?>
     <input type="button" id="eraseButton" value="_(Erase)_" onclick="eraseDisk('<?=$name?>')"<?=$erasable?'':' disabled'?>>
   <?endif;?>
diff --git a/emhttp/plugins/dynamix/include/ToggleState.php b/emhttp/plugins/dynamix/include/ToggleState.php
index 07241d31b..d8e8b81e4 100644
--- a/emhttp/plugins/dynamix/include/ToggleState.php
+++ b/emhttp/plugins/dynamix/include/ToggleState.php
@@ -46,7 +46,7 @@ default:
   foreach ($disks as $disk) {
     if (_var($disk,'status') != 'DISK_OK') continue;
     $array = ($name=='array' && in_array(_var($disk,'type'),['Parity','Data']));
-    if ($array || explode($tilde,prefix(_var($disk,'name')))[0]==$name) emcmd("cmdSpin{$action}="._var($disk,'name'));
+    if ($array || explode($tilde_,prefix(_var($disk,'name')))[0]==$name) emcmd("cmdSpin{$action}="._var($disk,'name'));
   }
   break;
 }
diff --git a/emhttp/plugins/dynamix/include/Wrappers.php b/emhttp/plugins/dynamix/include/Wrappers.php
index bd59159c4..e8e2f034f 100644
--- a/emhttp/plugins/dynamix/include/Wrappers.php
+++ b/emhttp/plugins/dynamix/include/Wrappers.php
@@ -17,9 +17,9 @@ $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 $subpools = ['special','logs','dedup','cache','spares'];
 
 // ZFS subpool name separator and replacement
-$tilde = '~';
-$proxy = '__';
-$arrow = '&#187;';
+$tilde_ = '~';
+$proxy_ = '__';
+$arrow_ = '&#187;';
 
 // Wrapper functions
 function parse_plugin_cfg($plugin, $sections=false, $scanner=INI_SCANNER_NORMAL) {
@@ -95,15 +95,15 @@ function ipaddr($ethX='eth0', $prot=4) {
   }
 }
 function no_tilde($name) {
-  global $tilde,$proxy;
-  return str_replace($tilde,$proxy,$name);
+  global $tilde_,$proxy_;
+  return str_replace($tilde_,$proxy_,$name);
 }
 function prefix($key) {
   return preg_replace('/\d+$/','',$key);
 }
 function isSubpool($name) {
-  global $subpools, $tilde;
-  $subpool = my_explode($tilde,$name)[1];
+  global $subpools, $tilde_;
+  $subpool = my_explode($tilde_,$name)[1];
   return in_array($subpool,$subpools) ? $subpool : false;
 }
 // convert strftime to date format
diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list
index eccbd2a01..84ec7c8c6 100755
--- a/emhttp/plugins/dynamix/nchan/device_list
+++ b/emhttp/plugins/dynamix/nchan/device_list
@@ -37,7 +37,7 @@ function model($id) {
   return substr($id,0,strrpos($id,'_'));
 }
 function device_info(&$disk,$online) {
-  global $pools, $var, $crypto, $tilde, $arrow;
+  global $pools, $var, $crypto, $tilde_, $arrow_;
   if (!$online || _var($disk,'fsStatus')!='Mounted' || (in_array(_var($disk,'type'),['Parity','Cache']) && (!in_array(_var($disk,'name'),$pools) || isSubpool(_var($disk,'name'))))) {
     $view = "<a class='view'></a>";
   } else {
@@ -46,8 +46,8 @@ function device_info(&$disk,$online) {
   }
   $name = _var($disk,'name');
   $named = no_tilde($name);
-  $extra = my_explode($tilde,$name)[1];
-  $fancyname = compress($extra ? "$arrow "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
+  $extra = my_explode($tilde_,$name)[1];
+  $fancyname = compress($extra ? "$arrow_ "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
   $type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
   $pool = _var($disk,'type')=='Cache';
   $parity = _var($disk,'type')=='Parity';
@@ -446,7 +446,7 @@ while (true) {
   foreach ($cache as $disk) $crypto |= _var($disk,'luksState',0)!=0 || vfs_luks(_var($disk,'fsType'));
   foreach ($pools as $pool) {
     $echo[$n] = "pool_device".($n-2)."\n";
-    $root  = explode($tilde,$pool)[0];
+    $root  = explode($tilde_,$pool)[0];
     $print = array_filter(array_column($cache,'name'),function($name) use ($pools,$root) {return in_array($name,$pools) && strncmp($root,$name,strlen($root))==0;});
     $print = end($print);
     if (_var($var,'fsState')=='Stopped') {
@@ -465,8 +465,8 @@ while (true) {
       $echo[$n] .= "<tr class='tr_last'><td>"._('Slots').":</td><td colspan='8'><span class='slots'><span class='slots-left'>".cache_slots($off,$pool,_var($cache[$pool],'devicesSb'),_var($cache[$pool],'slots',0))."</span>";
       $zfsPool = strstr(_var($cache[$pool],'fsType'),'zfs') && !isSubpool($pool);
       if ($zfsPool) {
-        $current_subpools = array_filter($pools, function($element) use ($pool,$tilde) {return strpos($element, "{$pool}{$tilde}")!==false;});
-        $current_subpools_list = str_replace("{$pool}{$tilde}","", implode(',', $current_subpools));
+        $current_subpools = array_filter($pools, function($element) use ($pool,$tilde_) {return strpos($element, "{$pool}{$tilde_}")!==false;});
+        $current_subpools_list = str_replace("{$pool}{$tilde_}","", implode(',', $current_subpools));
         $echo[$n] .= "<input type='button' value='"._('Add Subpool')."' class='subpool' onclick='addSubpoolPopup(\"$pool\",\"$current_subpools_list\")'".(count($current_subpools)<count($subpools)?'':' disabled').">";
       }
       $echo[$n] .= "</span></td><td></td></tr>";
@@ -479,7 +479,7 @@ while (true) {
       if (strcmp($root,$pool)!=0) $cache[$root]['devices'] += $cache[$pool]['devices'];
       if (strcmp($pool,$print)==0) {
         delete_file($pool_log);
-        if (_var($display,'total') && _var($cache[$root],'devices',0)>1) $echo[$n] .= show_totals(sprintf(_('Pool of %s devices'),my_word($cache[$root]['devices'])),strpos($pool,$tilde)!==false,"$root*");
+        if (_var($display,'total') && _var($cache[$root],'devices',0)>1) $echo[$n] .= show_totals(sprintf(_('Pool of %s devices'),my_word($cache[$root]['devices'])),strpos($pool,$tilde_)!==false,"$root*");
         $sum = initSum();
       }
    }
diff --git a/emhttp/plugins/dynamix/nchan/update_2 b/emhttp/plugins/dynamix/nchan/update_2
index 975c07110..b80d35319 100755
--- a/emhttp/plugins/dynamix/nchan/update_2
+++ b/emhttp/plugins/dynamix/nchan/update_2
@@ -126,7 +126,7 @@ function active_disks($disk) {
   return substr(_var($disk,'status'),0,7)!='DISK_NP' && in_array(_var($disk,'type'),['Parity','Data']);
 }
 function device_name(&$disk) {
-  global $tilde, $arrow;
+  global $tilde_, $arrow_;
   switch (_var($disk,'type')) {
     case 'Extra' :
     case 'Parity': $type = _var($disk,'rotational') ? 'disk' : 'nvme'; break;
@@ -134,8 +134,8 @@ function device_name(&$disk) {
     case 'Cache' : $type = _var($disk,'rotational') ? (_var($disk,'luksState') ? 'disk-encrypted' : 'disk') : 'nvme'; break;
   }
   $name = _var($disk,'name');
-  $extra = my_explode($tilde,$name)[1];
-  $fancyname = compress($extra ? "$arrow "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
+  $extra = my_explode($tilde_,$name)[1];
+  $fancyname = compress($extra ? "$arrow_ "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
   return "<i class='icon-$type f14'></i> <a href=\"".htmlspecialchars("/Dashboard/Main/Settings/Device?name=$name")."\" title=\"$fancyname settings\">$fancyname</a>";
 }
 function device_status(&$disk, &$error, &$warning) {