From 7154cc48fe1f947824ca131ec86923d042f57820 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 2 Nov 2023 01:56:26 +0100
Subject: [PATCH] Fixes for ZFS subpools

---
 emhttp/plugins/dynamix/ArrayDevices.page   |  2 +-
 emhttp/plugins/dynamix/include/Helpers.php |  7 ++++-
 emhttp/plugins/dynamix/include/publish.php | 31 +++++++++++-----------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/emhttp/plugins/dynamix/ArrayDevices.page b/emhttp/plugins/dynamix/ArrayDevices.page
index a101b4098..f7f500d31 100644
--- a/emhttp/plugins/dynamix/ArrayDevices.page
+++ b/emhttp/plugins/dynamix/ArrayDevices.page
@@ -15,7 +15,7 @@ Tag="database"
  */
 ?>
 <script>
-String.prototype.no_tilde = function(){return this.replace('~','_-_');}
+String.prototype.no_tilde = function(){return this.replace('<?=$tilde?>','<?=$proxy?>');}
 String.prototype.master = function(){return this.split('~')[0];}
 
 function toggle_state(device,name,action) {
diff --git a/emhttp/plugins/dynamix/include/Helpers.php b/emhttp/plugins/dynamix/include/Helpers.php
index a4b27fc3a..50cc41f65 100644
--- a/emhttp/plugins/dynamix/include/Helpers.php
+++ b/emhttp/plugins/dynamix/include/Helpers.php
@@ -15,6 +15,10 @@ $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
 require_once "$docroot/webGui/include/Secure.php";
 
+// ZFS subpool name separator and replacement
+$tilde = '~';
+$proxy = '__';
+
 // Helper functions
 function my_scale($value, &$unit, $decimals=NULL, $scale=NULL, $kilo=1000) {
   global $display,$language;
@@ -64,7 +68,8 @@ function my_hyperlink($text, $link) {
   return str_replace(['[',']'],["<a href=\"$link\">","</a>"],$text);
 }
 function no_tilde($name) {
-  return str_replace('~','_-_',$name);
+  global $tilde,$proxy;
+  return str_replace($tilde,$proxy,$name);
 }
 function prefix($key) {
   return preg_replace('/\d+$/','',$key);
diff --git a/emhttp/plugins/dynamix/include/publish.php b/emhttp/plugins/dynamix/include/publish.php
index 6f7f1acb6..9dc5a44ce 100644
--- a/emhttp/plugins/dynamix/include/publish.php
+++ b/emhttp/plugins/dynamix/include/publish.php
@@ -1,5 +1,5 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
+/* Copyright 2005-2023, Lime Technology
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -10,21 +10,20 @@
  */
 ?>
 <?
-function curl_socket($socket, $url, $postdata=NULL)
-{
-    $ch = curl_init($url);
-    curl_setopt($ch, CURLOPT_UNIX_SOCKET_PATH, $socket);
-    if ($postdata !== NULL) {
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $postdata);
-    }
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-    $result = curl_exec($ch);
-    curl_close($ch);
-    return $result;
+function curl_socket($socket, $url, $message) {
+  $com = curl_init($url);
+  curl_setopt_array($com,[
+    CURLOPT_UNIX_SOCKET_PATH => $socket,
+    CURLOPT_POST=> 1,
+    CURLOPT_POSTFIELDS => $message,
+    CURLOPT_RETURNTRANSFER => true
+  ]);
+  $reply = curl_exec($com);
+  curl_close($com);
+  return $reply;
 }
-function publish($endpoint, $message, $len=1)
-{
-    return curl_socket("/var/run/nginx.socket", "http://localhost/pub/$endpoint?buffer_length=$len", $message);
+
+function publish($endpoint, $message, $len=1) {
+  return curl_socket("/var/run/nginx.socket", "http://localhost/pub/$endpoint?buffer_length=$len", $message);
 }
 ?>