From a46cc02930b82f9e612799b8bbcc99355db0337a Mon Sep 17 00:00:00 2001
From: Matthew Saunders Brown <msb@stackaas.com>
Date: Wed, 31 Aug 2022 14:19:30 -0700
Subject: [PATCH] fix isset checks

---
 panel/ui/header.html                             | 8 ++++----
 panel/ui/vmail/aliases-delete.html               | 2 +-
 panel/ui/vmail/aliases.html                      | 4 ++--
 panel/ui/vmail/autoresponders-autoresponder.html | 2 +-
 panel/ui/vmail/autoresponders-delete.html        | 2 +-
 panel/ui/vmail/autoresponders.html               | 2 +-
 panel/ui/vmail/domains-delete.html               | 4 +---
 panel/ui/vmail/domains.html                      | 2 +-
 panel/ui/vmail/forwards-delete.html              | 2 +-
 panel/ui/vmail/forwards-forward.html             | 3 +--
 panel/ui/vmail/forwards.html                     | 2 +-
 panel/ui/vmail/mboxes-delete.html                | 2 +-
 panel/ui/vmail/mboxes.html                       | 2 +-
 13 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/panel/ui/header.html b/panel/ui/header.html
index dfc6e8c..a2055d3 100644
--- a/panel/ui/header.html
+++ b/panel/ui/header.html
@@ -24,7 +24,7 @@
     <a href="{{@BASE}}/Logout">Logout</a>
   </check>
 
-  <check if="{{ @NAV.subnav }}">
+  <check if="isset(@NAV.subnav)">
     <true>
       <p style="padding-top: 5px">
       >>
@@ -50,15 +50,15 @@
     </false>
   </check>
 </nav>
-<check if="{{ @page_header }}">
+<check if="isset(@page_header)">
   <h1>{{@page_header}}</h1>
 </check>
 </header>
 <main>
-<check if="{{ @ERROR.text }}">
+<check if="isset(@ERROR.text)">
   <h3>{{@ERROR.text}}</h3>
 </check>
-<check if="{{ @SESSION.messages }}">
+<check if="isset(@SESSION.messages)">
   <p>
     <section style="color:red">
       <repeat group="{{ @SESSION.messages }}" value="{{ @panel_message }}">
diff --git a/panel/ui/vmail/aliases-delete.html b/panel/ui/vmail/aliases-delete.html
index b32fd17..05c37a3 100644
--- a/panel/ui/vmail/aliases-delete.html
+++ b/panel/ui/vmail/aliases-delete.html
@@ -1,6 +1,6 @@
 <include href="header.html" />
 
-<check if="{{ @confirm }}">
+<check if="isset(@confirm)">
   <true>
     <form action="{{@REALM}}" method="POST">
     <fieldset>
diff --git a/panel/ui/vmail/aliases.html b/panel/ui/vmail/aliases.html
index bcf0dc1..40975e1 100644
--- a/panel/ui/vmail/aliases.html
+++ b/panel/ui/vmail/aliases.html
@@ -1,6 +1,6 @@
 <include href="header.html" />
 
-<check if="{{ @aliases_array }}">
+<check if="isset(@aliases_array)">
   <true>
 
     <table>
@@ -29,7 +29,7 @@
 <b>Email Account</b> is the existing email account that the alias address is delivered to.<br>
 </p>
 <p>
-<check if="{{ @PARAMS.mbox }}">
+<check if="isset(@PARAMS.mbox)">
   <true>
     <a href="{{@REALM}}/Add">Add new email alias form</a>
   </true>
diff --git a/panel/ui/vmail/autoresponders-autoresponder.html b/panel/ui/vmail/autoresponders-autoresponder.html
index c736bc5..e26de0f 100644
--- a/panel/ui/vmail/autoresponders-autoresponder.html
+++ b/panel/ui/vmail/autoresponders-autoresponder.html
@@ -1,7 +1,7 @@
 <include href="header.html" />
 
 
-<check if="{{ @autoresponders_array }}">
+<check if="isset(@autoresponders_array)">
 <table>
 <!--  <tr>
     <th colspan="2">Autoresponder for {{ @mbox  }}@{{ @domain  }} </th>
diff --git a/panel/ui/vmail/autoresponders-delete.html b/panel/ui/vmail/autoresponders-delete.html
index b9028c5..f804883 100644
--- a/panel/ui/vmail/autoresponders-delete.html
+++ b/panel/ui/vmail/autoresponders-delete.html
@@ -1,6 +1,6 @@
 <include href="header.html" />
 
-<check if="{{ @confirm }}">
+<check if="isset(@confirm)">
   <true>
     <form action="{{@REALM}}" method="POST">
     <fieldset>
diff --git a/panel/ui/vmail/autoresponders.html b/panel/ui/vmail/autoresponders.html
index b217899..c8c456e 100644
--- a/panel/ui/vmail/autoresponders.html
+++ b/panel/ui/vmail/autoresponders.html
@@ -1,6 +1,6 @@
 <include href="header.html" />
 
-<check if="{{ @autoresponders_array }}">
+<check if="isset(@autoresponders_array)">
   <true>
     <table>
     <tr>
diff --git a/panel/ui/vmail/domains-delete.html b/panel/ui/vmail/domains-delete.html
index 6ae9bcc..88ba445 100644
--- a/panel/ui/vmail/domains-delete.html
+++ b/panel/ui/vmail/domains-delete.html
@@ -1,8 +1,6 @@
 <include href="header.html" />
 
-<check if="{{ @confirm }}">
-
-
+<check if="isset(@confirm)">
 
 <form action="{{@NAV.fullpath}}" method="POST">
 <fieldset>
diff --git a/panel/ui/vmail/domains.html b/panel/ui/vmail/domains.html
index e08a9f5..e7d6b16 100644
--- a/panel/ui/vmail/domains.html
+++ b/panel/ui/vmail/domains.html
@@ -1,6 +1,6 @@
 <include href="header.html" />
 
-<check if="{{ @domains_array }}">
+<check if="isset(@domains_array)">
 <true>
   <table>
     <tr>
diff --git a/panel/ui/vmail/forwards-delete.html b/panel/ui/vmail/forwards-delete.html
index ada79a2..4c78731 100644
--- a/panel/ui/vmail/forwards-delete.html
+++ b/panel/ui/vmail/forwards-delete.html
@@ -1,6 +1,6 @@
 <include href="header.html" />
 
-<check if="{{ @confirm }}">
+<check if="isset(@confirm)">
   <true>
     <form action="{{@REALM}}" method="POST">
     <fieldset>
diff --git a/panel/ui/vmail/forwards-forward.html b/panel/ui/vmail/forwards-forward.html
index cf6b899..9d966d2 100644
--- a/panel/ui/vmail/forwards-forward.html
+++ b/panel/ui/vmail/forwards-forward.html
@@ -1,7 +1,6 @@
 <include href="header.html" />
 
-
-<check if="{{ @forward_array }}">
+<check if="isset(@forward_array)">
 <table>
   <tr>
     <th>Email Account</th>
diff --git a/panel/ui/vmail/forwards.html b/panel/ui/vmail/forwards.html
index c0f0df2..052105b 100644
--- a/panel/ui/vmail/forwards.html
+++ b/panel/ui/vmail/forwards.html
@@ -1,6 +1,6 @@
 <include href="header.html" />
 
-<check if="{{ @forwards_array }}">
+<check if="isset(@forwards_array)">
   <true>
     <table>
     <tr>
diff --git a/panel/ui/vmail/mboxes-delete.html b/panel/ui/vmail/mboxes-delete.html
index c9eb7e4..27f9f19 100644
--- a/panel/ui/vmail/mboxes-delete.html
+++ b/panel/ui/vmail/mboxes-delete.html
@@ -1,6 +1,6 @@
 <include href="header.html" />
 
-<check if="{{ @confirm }}">
+<check if="isset(@confirm)">
   <true>
     <form action="{{@REALM}}" method="POST">
     <fieldset>
diff --git a/panel/ui/vmail/mboxes.html b/panel/ui/vmail/mboxes.html
index 356d85c..ada427f 100644
--- a/panel/ui/vmail/mboxes.html
+++ b/panel/ui/vmail/mboxes.html
@@ -1,6 +1,6 @@
 <include href="header.html" />
 
-<check if="{{ @mboxes_array }}">
+<check if="isset(@mboxes_array)">
 <true>
   <table>
     <tr>