From 9323dacbaf76441d0179377e988cd438289ad60e Mon Sep 17 00:00:00 2001
From: Matthew Saunders Brown <matthewsaundersbrown@gmail.com>
Date: Tue, 4 Feb 2025 09:49:04 -0800
Subject: [PATCH] update ui to use domain var instead of virtualhost, for
 compat with new vhost-get.sh script

---
 panel/ui/vhost/users-user.html   |  4 ++--
 panel/ui/vhost/vhosts-edit.html  |  2 +-
 panel/ui/vhost/vhosts-vhost.html | 32 ++++++++++++++++----------------
 panel/ui/vhost/vhosts.html       |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/panel/ui/vhost/users-user.html b/panel/ui/vhost/users-user.html
index ca89582..1b64c15 100644
--- a/panel/ui/vhost/users-user.html
+++ b/panel/ui/vhost/users-user.html
@@ -37,11 +37,11 @@
     <repeat group="{{ @vhosts_array }}" value="{{ @vhost_domain }}">
 
       <tr>
-        <td><a href="{{@BASE}}/Websites/{{ @vhost_domain.virtualhost  }}">{{ @vhost_domain.virtualhost  }}</a></td>
+        <td><a href="{{@BASE}}/Websites/{{ @vhost_domain.domain  }}">{{ @vhost_domain.domain  }}</a></td>
         <td>{{ @vhost_domain.username }}</td>
         <td>{{ @vhost_domain.status }}</td>
         <td>{{ @vhost_domain.php }}</td>
-        <td><a href="{{@BASE}}/Websites/{{ @vhost_domain.virtualhost  }}/Disable">Disable</a> <a href="{{@BASE}}/Websites/{{ @vhost_domain.virtualhost }}/Delete">Delete</a></td>
+        <td><a href="{{@BASE}}/Websites/{{ @vhost_domain.domain  }}/Disable">Disable</a> <a href="{{@BASE}}/Websites/{{ @vhost_domain.domain }}/Delete">Delete</a></td>
       </tr>
 
     </repeat>
diff --git a/panel/ui/vhost/vhosts-edit.html b/panel/ui/vhost/vhosts-edit.html
index 33ab018..ad454c9 100644
--- a/panel/ui/vhost/vhosts-edit.html
+++ b/panel/ui/vhost/vhosts-edit.html
@@ -4,7 +4,7 @@
 <p>
 <form action="{{@REALM}}" method="POST">
 <fieldset>
-  <legend>Change PHP Version for {{ @vhost_array.virtualhost }}</legend>
+  <legend>Change PHP Version for {{ @vhost_array.domain }}</legend>
   <label for="fpmmax">Change PHP Version <small>(Default on this server is {{ @vhost_array.fpm_version }})</small></label>
   <select id="fpm_version" name="fpm_version">
     <repeat group="{{ @vhost_array.fpm_versions_array }}" value="{{ @fpm_version }}">
diff --git a/panel/ui/vhost/vhosts-vhost.html b/panel/ui/vhost/vhosts-vhost.html
index 0954a25..3550c26 100644
--- a/panel/ui/vhost/vhosts-vhost.html
+++ b/panel/ui/vhost/vhosts-vhost.html
@@ -8,11 +8,11 @@
     <th>Action</th>
   </tr>
   <tr>
-    <td>{{ @vhost_array.virtualhost }}</td>
+    <td>{{ @vhost_array.domain }}</td>
     <td>{{ @vhost_array.status }}</td>
     <td>{{ @vhost_array.php }}</td>
     <td>
-      <a href="{{@BASE}}/Websites/{{ @vhost_array.virtualhost }}/Edit">Edit</a>
+      <a href="{{@BASE}}/Websites/{{ @vhost_array.domain }}/Edit">Edit</a>
       <check if="{{ @NAV.mapping=='vpanel' }}">
         <check if="{{ @vhost_array.status=='Enabled' }}">
           <true><a href="{{@REALM}}/Disable">Disable</a></true>
@@ -57,7 +57,7 @@
         <td style="white-space: nowrap;">{{ @cert_array.common }}</td>
         <td style="white-space: nowrap;">{{ @cert_array.end }}</td>
         <td style="white-space: nowrap; text-align: right;">{{ @cert_array.alternative | raw }}</td>
-        <check if="{{ @NAV.mapping=='vpanel' }}"><td style="white-space: nowrap;"><a href="{{@BASE}}/Certs/{{@vhost_array.virtualhost}}/Delete?r={{@PATH}}">Delete</a></td></check>
+        <check if="{{ @NAV.mapping=='vpanel' }}"><td style="white-space: nowrap;"><a href="{{@BASE}}/Certs/{{@vhost_array.domain}}/Delete?r={{@PATH}}">Delete</a></td></check>
       </tr>
     </table>
     <br><br>
@@ -67,31 +67,31 @@
       <hr>
       <check if="{{ @dnsinfo.a.status=='Verified' }}">
         <true>
-          You need a Security Certificate. <a href="{{@BASE}}/Certs/{{@vhost_array.virtualhost}}/Add?r={{@PATH}}">Click Here</a> to add one now.
+          You need a Security Certificate. <a href="{{@BASE}}/Certs/{{@vhost_array.domain}}/Add?r={{@PATH}}">Click Here</a> to add one now.
         </true>
         <false>
-          <span style="color:red">You need a Security Certificate for {{ @vhost_array.virtualhost }}.</span>
+          <span style="color:red">You need a Security Certificate for {{ @vhost_array.domain }}.</span>
           <br>
           Before you can add one you must make the DNS change listed below. Once that's completed come back here and this message will change to an option to create a Security Certificate.
           <br>
           <small>Note that after you add DNS records it can take some time for the changes to propagate and show up here.</small>
           <br><br>
           <table>
-            <tr><th style="color:{{ @dnsinfo.a.color }}" colspan="2">{{ @dnsinfo.a.status }} A Record for {{ @vhost_array.virtualhost }}</th></tr>
+            <tr><th style="color:{{ @dnsinfo.a.color }}" colspan="2">{{ @dnsinfo.a.status }} A Record for {{ @vhost_array.domain }}</th></tr>
             <tr><td style="text-align: right;">Type:</td><td>A</td></tr>
-            <tr><td style="text-align: right;">Host:</td><td>{{ @vhost_array.virtualhost }}</td></tr>
+            <tr><td style="text-align: right;">Host:</td><td>{{ @vhost_array.domain }}</td></tr>
             <tr><td style="text-align: right;">Value:</td><td>{{ @dnsinfo.server_addr }}</td></tr>
             <tr><td style="text-align: right;">TTL:</td><td>3600 (or default)</td></tr>
-            <tr><td></td><td><small>This should be the only A record for {{ @vhost_array.virtualhost }}.</small></td></tr>
+            <tr><td></td><td><small>This should be the only A record for {{ @vhost_array.domain }}.</small></td></tr>
           </table>
           <br><br>
           <table>
-            <tr><th style="color:{{ @dnsinfo.a.color }}" colspan="2">Verify CNAME Record for www.{{ @vhost_array.virtualhost }}</th></tr>
+            <tr><th style="color:{{ @dnsinfo.a.color }}" colspan="2">Verify CNAME Record for www.{{ @vhost_array.domain }}</th></tr>
             <tr><td style="text-align: right;">Type:</td><td>CNAME</td></tr>
-            <tr><td style="text-align: right;">Host:</td><td>www.{{ @vhost_array.virtualhost }}</td></tr>
-            <tr><td style="text-align: right;">Value:</td><td>{{ @vhost_array.virtualhost }}</td></tr>
+            <tr><td style="text-align: right;">Host:</td><td>www.{{ @vhost_array.domain }}</td></tr>
+            <tr><td style="text-align: right;">Value:</td><td>{{ @vhost_array.domain }}</td></tr>
             <tr><td style="text-align: right;">TTL:</td><td>3600 (or default)</td></tr>
-            <tr><td></td><td><small>This should be the only record for www.{{ @vhost_array.virtualhost }}.<br>Note this admin did not check for this record, it may already exist.</small></td></tr>
+            <tr><td></td><td><small>This should be the only record for www.{{ @vhost_array.domain }}.<br>Note this admin did not check for this record, it may already exist.</small></td></tr>
           </table>
         </false>
       </check>
@@ -105,10 +105,10 @@
   <tr><td style="text-align: right;">Protocol:</td><td>SFTP (SSH File Transfer Protocol)</td></tr>
   <tr><td style="text-align: right;">Hostname:</td><td>
     <check if="isset(@cert_array)">
-      <true>{{ @vhost_array.virtualhost }}</true>
+      <true>{{ @vhost_array.domain }}</true>
       <false>
         <check if="{{ @dnsinfo.a.status=='Verified' }}">
-          <true>{{ @vhost_array.virtualhost }}</true>
+          <true>{{ @vhost_array.domain }}</true>
           <false>{{ @dnsinfo.server_addr }}</false>
         </check>
       </false>
@@ -116,7 +116,7 @@
   </td></tr>
   <tr><td style="text-align: right;">Username:</td><td>{{ @vhost_array.username  }}</td></tr>
   <tr><td style="text-align: right;">Password:</td><td><span class="hidden">{{ @users_array.passwd }}</span> <small>&larr; hover mouse here to reveal</small></td></tr>
-  <tr><td style="text-align: right;">Directory:</td><td>/srv/www/{{ @vhost_array.virtualhost  }}/html/</td></tr>
+  <tr><td style="text-align: right;">Directory:</td><td>/srv/www/{{ @vhost_array.domain  }}/html/</td></tr>
   <tr><td style="text-align: right;"><small>Notes:</small></td><td><small>The above information can also be used for SSH access.</small></td></tr>
 </table>
 
@@ -131,7 +131,7 @@
   <tr><td style="text-align: right;">phpMyAdmin:</td><td>
     <check if="isset(@cert_array)">
     <true>
-      <a href="https://{{ @vhost_array.virtualhost }}/phpMyAdmin">https://{{ @vhost_array.virtualhost }}/phpMyAdmin</a>
+      <a href="https://{{ @vhost_array.domain }}/phpMyAdmin">https://{{ @vhost_array.domain }}/phpMyAdmin</a>
     </true>
     <false>
       <a href="https://{{ @HOST }}/phpMyAdmin">https://{{ @HOST }}/phpMyAdmin</a>
diff --git a/panel/ui/vhost/vhosts.html b/panel/ui/vhost/vhosts.html
index d6d5e3b..581fe08 100644
--- a/panel/ui/vhost/vhosts.html
+++ b/panel/ui/vhost/vhosts.html
@@ -12,7 +12,7 @@
     <repeat group="{{ @vhosts_array }}" value="{{ @vhost_domain }}">
 
       <tr>
-        <td><a href="{{@BASE}}/Websites/{{ @vhost_domain.virtualhost  }}">{{ @vhost_domain.virtualhost }}</a></td>
+        <td><a href="{{@BASE}}/Websites/{{ @vhost_domain.domain  }}">{{ @vhost_domain.domain }}</a></td>
         <td><a href="{{@BASE}}/Users/{{ @vhost_domain.username  }}">{{ @vhost_domain.username }}</a></td>
         <td>{{ @vhost_domain.status  }}</td>
       </tr>