From da4cd445901bcccfd0c53d1a16ed460caeeefe0a Mon Sep 17 00:00:00 2001
From: Belle Aerni <belleaerni@gmail.com>
Date: Fri, 15 Dec 2023 15:26:33 -0800
Subject: [PATCH] Bugfixes (#1978)

* Fixed public tickets

* Resolved the most common reported errors
---
 src/modules/Formbuilder/Service.php             | 16 +++++++++++++---
 src/modules/Invoice/Service.php                 |  3 ++-
 .../mod_support_contact_us.html.twig            | 17 ++++-------------
 ...od_support_contact_us_conversation.html.twig |  6 +++---
 src/modules/Theme/Service.php                   |  3 ++-
 5 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/modules/Formbuilder/Service.php b/src/modules/Formbuilder/Service.php
index e4d43d1dc..3ca9a2e9b 100644
--- a/src/modules/Formbuilder/Service.php
+++ b/src/modules/Formbuilder/Service.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2022-2023 FOSSBilling
  * Copyright 2011-2021 BoxBilling, Inc.
@@ -240,9 +241,18 @@ class Service implements InjectionAwareInterface
     private function fieldsJsonDecode($fields)
     {
         foreach ($fields as $key => $r) {
-            $fields[$key]['options'] = json_decode($r['options'], true);
-            $fields[$key]['default_value'] = (json_decode($r['default_value'])) ? (json_decode($r['default_value'], true)) : $r['default_value'];
-        }
+            if (!empty($r['options'])) {
+                $fields[$key]['options'] = json_decode($r['options'], true);
+            } else {
+                $fields[$key]['options'] = [];
+            }
+
+            if(!empty($r['default_value'])){
+                $fields[$key]['default_value'] = (json_decode($r['default_value'])) ? (json_decode($r['default_value'], true)) : $r['default_value'];
+            } else {
+                $fields[$key]['default_value'] = '';
+            }
+         }
 
         return $fields;
     }
diff --git a/src/modules/Invoice/Service.php b/src/modules/Invoice/Service.php
index 64b9abc40..5082c34bd 100644
--- a/src/modules/Invoice/Service.php
+++ b/src/modules/Invoice/Service.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2022-2023 FOSSBilling
  * Copyright 2011-2021 BoxBilling, Inc.
@@ -1545,7 +1546,7 @@ class Service implements InjectionAwareInterface
         ];
 
         foreach ($sourceData as $label => $data) {
-            if (empty(trim($data))) {
+            if ($data !== null && empty(trim($data))) {
                 unset($sourceData[$label]);
             }
         }
diff --git a/src/modules/Support/html_client/mod_support_contact_us.html.twig b/src/modules/Support/html_client/mod_support_contact_us.html.twig
index 4808810bd..9ddb1ed86 100644
--- a/src/modules/Support/html_client/mod_support_contact_us.html.twig
+++ b/src/modules/Support/html_client/mod_support_contact_us.html.twig
@@ -21,7 +21,7 @@
                     </div>
                 </div>
                 <div class="card-body">
-                    <form method="post" action="" id="public-ticket-create" class="form span6">
+                    <form method="post" action="{{ 'api/guest/support/ticket_create'|link}} " id="public-ticket-create" class="api-form" data-api-jsonp="onTicketCreate">
                         <input type="hidden" name="CSRFToken" value="{{ CSRFToken }}"/>
                         <div class="mb-3">
                             <label class="form-label" for="name">{{ 'Name'|trans }}</label>
@@ -82,18 +82,9 @@
     <script>
         $(function () {
             $('#anti-spam').remove();
-
-            $('#public-ticket-create').on('submit', function (event) {
-                $('.wait').show();
-                bb.post(
-                    'guest/support/ticket_create',
-                    $(this).serialize(),
-                    function (result) {
-                        bb.redirect("{{ 'support/contact-us/conversation'|link }}" + '/' + result);
-                    }
-                );
-                return false;
-            });
         });
+        function onTicketCreate(result){
+            bb.redirect("{{ 'support/contact-us/conversation'|link }}" + '/' + result);
+        }
     </script>
 {% endblock %}
diff --git a/src/modules/Support/html_client/mod_support_contact_us_conversation.html.twig b/src/modules/Support/html_client/mod_support_contact_us_conversation.html.twig
index 8d573f9ed..ac3077b91 100644
--- a/src/modules/Support/html_client/mod_support_contact_us_conversation.html.twig
+++ b/src/modules/Support/html_client/mod_support_contact_us_conversation.html.twig
@@ -48,8 +48,8 @@
             </table>
             <hr>
             <div class="row">
-                <button class="btn btn-primary btn-small ms-3" href="{{ 'api/guest/support/ticket_close'|link({ 'hash': ticket.hash, 'CSRFToken': CSRFToken })}}" id="new-ticket-button" data-api-reload="1"> {{ 'Close ticket'|trans }}</button>
-                <a class="btn btn-info btn-small ms-2" href="#reply-to">{{ 'Reply'|trans }}</a>
+                <button class="btn btn-primary btn-small ms-2 w-25" href="{{ 'api/guest/support/ticket_close'|link({ 'hash': ticket.hash, 'CSRFToken': CSRFToken })}}" id="new-ticket-button" data-api-reload="1"> {{ 'Close ticket'|trans }}</button>
+                <a class="btn btn-info btn-small ms-2 w-25" href="#reply-to">{{ 'Reply'|trans }}</a>
             </div>
         </div>
         <div class="card-body">
@@ -85,7 +85,7 @@
                     <input type="hidden" name="hash" value="{{ ticket.hash }}" />
                     
                     <textarea name="message" cols="5" rows="10" class="form-control" required="required" id="ticket-reply-text"></textarea>
-                    <button class="btn btn-primary btn-large" type="submit" id="submit-support-message" value="{{ 'Post'|trans }}" onclick="">{{ 'Post'|trans }}</button>
+                    <button class="btn btn-primary btn-large mt-1" type="submit" id="submit-support-message" value="{{ 'Post'|trans }}" onclick="">{{ 'Post'|trans }}</button>
                 </form>
             {% elseif ticket.status == 'closed' %}
                 <div class="alert alert-white text-center">{{ 'Ticket was closed and cannot be reopened.'|trans }}</div>
diff --git a/src/modules/Theme/Service.php b/src/modules/Theme/Service.php
index 5a1fa22cf..8b3476c21 100644
--- a/src/modules/Theme/Service.php
+++ b/src/modules/Theme/Service.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2022-2023 FOSSBilling
  * Copyright 2011-2021 BoxBilling, Inc.
@@ -420,7 +421,7 @@ class Service implements InjectionAwareInterface
 
     protected function isRouteAdmin()
     {
-        if (str_starts_with($_SERVER['REQUEST_URI'], ADMIN_PREFIX)) {
+        if (str_starts_with($_SERVER['REQUEST_URI'] ?? $_SERVER['PATH_INFO'], ADMIN_PREFIX)) {
             return true;
         }