diff --git a/portal/autopay.php b/client/autopay.php
similarity index 93%
rename from portal/autopay.php
rename to client/autopay.php
index 0a9c0eed..44280785 100644
--- a/portal/autopay.php
+++ b/client/autopay.php
@@ -4,10 +4,10 @@
  * Auto-pay configuration for PTC/finance contacts
  */
 
-require_once "inc_portal.php";
+require_once "includes/inc_all.php";
 
 if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) {
-    header("Location: portal_post.php?logout");
+    header("Location: post.php?logout");
     exit();
 }
 
@@ -30,7 +30,7 @@ if ($stripe_client_details) {
 // Stripe not enabled in settings
 if (!$config_stripe_enable || !$config_stripe_publishable || !$config_stripe_secret) {
     echo "Stripe payment error - Stripe is not enabled, please talk to your helpdesk for further information.";
-    include_once 'portal_footer.php';
+    include_once 'includes/footer.php';
     exit();
 }
 
@@ -50,7 +50,7 @@ if (!$config_stripe_enable || !$config_stripe_publishable || !$config_stripe_sec
             <br><br>
 
                 <div class="col-5">
-                    <form action="portal_post.php" method="POST">
+                    <form action="post.php" method="POST">
 
                         <div class="form-group">
                             <div class="custom-control custom-checkbox">
@@ -120,7 +120,7 @@ if (!$config_stripe_enable || !$config_stripe_publishable || !$config_stripe_sec
 
                 <hr>
                 <b>Actions</b><br>
-                - <a href="portal_post.php?stripe_remove_card&pm=<?php echo $stripe_pm; ?>">Remove saved card</a>
+                - <a href="post.php?stripe_remove_card&pm=<?php echo $stripe_pm; ?>">Remove saved card</a>
 
             <?php } ?>
 
@@ -131,4 +131,4 @@ if (!$config_stripe_enable || !$config_stripe_publishable || !$config_stripe_sec
 
 
 <?php
-require_once "portal_footer.php";
+require_once "includes/footer.php";
diff --git a/portal/certificates.php b/client/certificates.php
similarity index 94%
rename from portal/certificates.php
rename to client/certificates.php
index c3628bf9..7c2ddd10 100644
--- a/portal/certificates.php
+++ b/client/certificates.php
@@ -6,10 +6,10 @@
 
 header("Content-Security-Policy: default-src 'self'");
 
-require_once "inc_portal.php";
+require_once "includes/inc_all.php";
 
 if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) {
-    header("Location: portal_post.php?logout");
+    header("Location: post.php?logout");
     exit();
 }
 
@@ -58,4 +58,4 @@ $certificates_sql = mysqli_query($mysqli, "SELECT certificate_id, certificate_na
     </div>
 
 <?php
-require_once "portal_footer.php";
+require_once "includes/footer.php";
diff --git a/portal/check_login.php b/client/check_login.php
similarity index 100%
rename from portal/check_login.php
rename to client/check_login.php
diff --git a/portal/contact_add.php b/client/contact_add.php
similarity index 95%
rename from portal/contact_add.php
rename to client/contact_add.php
index bc290838..0cf023a7 100644
--- a/portal/contact_add.php
+++ b/client/contact_add.php
@@ -6,10 +6,10 @@
 
 header("Content-Security-Policy: default-src 'self'");
 
-require_once "inc_portal.php";
+require_once "includes/inc_all.php";
 
 if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) {
-    header("Location: portal_post.php?logout");
+    header("Location: post.php?logout");
     exit();
 }
 
@@ -26,7 +26,7 @@ if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) {
     </ol>
 
     <div class="col-md-6">
-        <form action="portal_post.php" method="post">
+        <form action="post.php" method="post">
             <!-- Prevent undefined checkbox errors on submit -->
             <input type="hidden" name="contact_billing" value="0">
             <input type="hidden" name="contact_technical" value="0">
@@ -93,4 +93,4 @@ if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) {
 
 
 <?php
-require_once "portal_footer.php";
+require_once "includes/footer.php";
diff --git a/portal/contact_edit.php b/client/contact_edit.php
similarity index 96%
rename from portal/contact_edit.php
rename to client/contact_edit.php
index c819ea51..813216bb 100644
--- a/portal/contact_edit.php
+++ b/client/contact_edit.php
@@ -6,10 +6,10 @@
 
 header("Content-Security-Policy: default-src 'self'");
 
-require_once "inc_portal.php";
+require_once "includes/inc_all.php";
 
 if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) {
-    header("Location: portal_post.php?logout");
+    header("Location: post.php?logout");
     exit();
 }
 
@@ -39,7 +39,7 @@ if ($row) {
     $contact_billing = intval($row['contact_billing']);
     $contact_auth_method = nullable_htmlentities($row['user_auth_method']);
 } else {
-    header("Location: portal_post.php?logout");
+    header("Location: post.php?logout");
     exit();
 }
 
@@ -56,7 +56,7 @@ if ($row) {
     </ol>
 
     <div class="col-md-6">
-        <form action="portal_post.php" method="post">
+        <form action="post.php" method="post">
             <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
             <!-- Prevent undefined checkbox errors on submit -->
             <input type="hidden" name="contact_billing" value="0">
@@ -126,4 +126,4 @@ if ($row) {
 
 
 <?php
-require_once "portal_footer.php";
+require_once "includes/footer.php";
diff --git a/portal/contacts.php b/client/contacts.php
similarity index 95%
rename from portal/contacts.php
rename to client/contacts.php
index dd29875b..b84799d9 100644
--- a/portal/contacts.php
+++ b/client/contacts.php
@@ -6,10 +6,10 @@
 
 header("Content-Security-Policy: default-src 'self'");
 
-require_once "inc_portal.php";
+require_once "includes/inc_all.php";
 
 if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) {
-    header("Location: portal_post.php?logout");
+    header("Location: post.php?logout");
     exit();
 }
 
@@ -77,4 +77,4 @@ $contacts_sql = mysqli_query($mysqli, "SELECT contact_id, contact_name, contact_
     </div>
 
 <?php
-require_once "portal_footer.php";
+require_once "includes/footer.php";
diff --git a/portal/document.php b/client/document.php
similarity index 92%
rename from portal/document.php
rename to client/document.php
index b5ea54d9..6628eaf6 100644
--- a/portal/document.php
+++ b/client/document.php
@@ -6,10 +6,10 @@
 
 header("Content-Security-Policy: default-src 'self'; img-src 'self' data:");
 
-require_once "inc_portal.php";
+require_once "includes/inc_all.php";
 
 if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) {
-    header("Location: portal_post.php?logout");
+    header("Location: post.php?logout");
     exit();
 }
 
@@ -42,7 +42,7 @@ if ($row) {
     $document_name = nullable_htmlentities($row['document_name']);
     $document_content = $purifier->purify($row['document_content']);
 } else {
-    header("Location: portal_post.php?logout");
+    header("Location: post.php?logout");
     exit();
 }
 
@@ -68,4 +68,4 @@ if ($row) {
 </div>
 
 <?php
-require_once "portal_footer.php";
+require_once "includes/footer.php";
diff --git a/portal/documents.php b/client/documents.php
similarity index 94%
rename from portal/documents.php
rename to client/documents.php
index 7f865d56..31a52e9e 100644
--- a/portal/documents.php
+++ b/client/documents.php
@@ -6,10 +6,10 @@
 
 header("Content-Security-Policy: default-src 'self'");
 
-require_once "inc_portal.php";
+require_once "includes/inc_all.php";
 
 if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) {
-    header("Location: portal_post.php?logout");
+    header("Location: post.php?logout");
     exit();
 }
 
@@ -61,4 +61,4 @@ $documents_sql = mysqli_query($mysqli, "SELECT document_id, document_name, docum
 </div>
 
 <?php
-require_once "portal_footer.php";
+require_once "includes/footer.php";
diff --git a/portal/domains.php b/client/domains.php
similarity index 92%
rename from portal/domains.php
rename to client/domains.php
index ead28f9a..3beac65f 100644
--- a/portal/domains.php
+++ b/client/domains.php
@@ -6,10 +6,10 @@
 
 header("Content-Security-Policy: default-src 'self'");
 
-require_once "inc_portal.php";
+require_once "includes/inc_all.php";
 
 if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) {
-    header("Location: portal_post.php?logout");
+    header("Location: post.php?logout");
     exit();
 }
 
@@ -52,4 +52,4 @@ $domains_sql = mysqli_query($mysqli, "SELECT domain_id, domain_name, domain_expi
     </div>
 
 <?php
-require_once "portal_footer.php";
+require_once "includes/footer.php";
diff --git a/portal/portal_functions.php b/client/functions.php
similarity index 100%
rename from portal/portal_functions.php
rename to client/functions.php
diff --git a/portal/portal_footer.php b/client/includes/footer.php
similarity index 100%
rename from portal/portal_footer.php
rename to client/includes/footer.php
diff --git a/portal/portal_header.php b/client/includes/header.php
similarity index 97%
rename from portal/portal_header.php
rename to client/includes/header.php
index 4bf730f5..bc360647 100644
--- a/portal/portal_header.php
+++ b/client/includes/header.php
@@ -87,7 +87,7 @@ header("X-Frame-Options: DENY"); // Legacy
                     <div class="dropdown-menu">
                         <a class="dropdown-item" href="profile.php"><i class="fas fa-fw fa-user mr-2"></i>Account</a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item" href="portal_post.php?logout"><i class="fas fa-fw fa-sign-out-alt mr-2"></i>Sign out</a>
+                        <a class="dropdown-item" href="post.php?logout"><i class="fas fa-fw fa-sign-out-alt mr-2"></i>Sign out</a>
                     </div>
                 </li>
             </ul>
diff --git a/portal/inc_portal.php b/client/includes/inc_all.php
similarity index 74%
rename from portal/inc_portal.php
rename to client/includes/inc_all.php
index aa814aca..d0ea5d15 100644
--- a/portal/inc_portal.php
+++ b/client/includes/inc_all.php
@@ -8,5 +8,5 @@ require_once '../config.php';
 require_once '../get_settings.php';
 require_once '../functions.php';
 require_once 'check_login.php';
-require_once 'portal_functions.php';
-require_once "portal_header.php";
+require_once 'functions.php';
+require_once "header.php";
diff --git a/portal/index.php b/client/index.php
similarity index 75%
rename from portal/index.php
rename to client/index.php
index eef09ea1..856a36bf 100644
--- a/portal/index.php
+++ b/client/index.php
@@ -6,11 +6,11 @@
 
 header("Content-Security-Policy: default-src 'self'");
 
-require_once "inc_portal.php";
+require_once "includes/inc_all.php";
 
 ?>
 <div class="col-md-2 offset-1">
     <a href="ticket_add.php" class="btn btn-primary btn-block">New ticket</a>
 </div>
 
-<?php require_once "portal_footer.php"; ?>
+<?php require_once "includes/footer.php"; ?>
diff --git a/portal/invoices.php b/client/invoices.php
similarity index 97%
rename from portal/invoices.php
rename to client/invoices.php
index 6cd1e9b8..654a4bd3 100644
--- a/portal/invoices.php
+++ b/client/invoices.php
@@ -6,11 +6,11 @@
 
 header("Content-Security-Policy: default-src 'self'");
 
-require_once "inc_portal.php";
+require_once "includes/inc_all.php";
 
 
 if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) {
-    header("Location: portal_post.php?logout");
+    header("Location: post.php?logout");
     exit();
 }
 
@@ -99,5 +99,5 @@ $invoices_sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_clie
 
 
 <?php
-require_once "portal_footer.php";
+require_once "includes/footer.php";
 
diff --git a/portal/login.php b/client/login.php
similarity index 100%
rename from portal/login.php
rename to client/login.php
diff --git a/portal/login_microsoft.php b/client/login_microsoft.php
similarity index 100%
rename from portal/login_microsoft.php
rename to client/login_microsoft.php
diff --git a/portal/login_reset.php b/client/login_reset.php
similarity index 100%
rename from portal/login_reset.php
rename to client/login_reset.php
diff --git a/portal/portal_post.php b/client/post.php
similarity index 98%
rename from portal/portal_post.php
rename to client/post.php
index ae6f50fe..7118407c 100644
--- a/portal/portal_post.php
+++ b/client/post.php
@@ -8,7 +8,7 @@ require_once '../config.php';
 require_once '../get_settings.php';
 require_once '../functions.php';
 require_once 'check_login.php';
-require_once 'portal_functions.php';
+require_once 'functions.php';
 
 if (isset($_POST['add_ticket'])) {
 
@@ -174,7 +174,7 @@ if (isset($_POST['add_ticket_comment'])) {
 
     } else {
         // The client does not have access to this ticket
-        header("Location: portal_post.php?logout");
+        header("Location: post.php?logout");
         exit();
     }
 }
@@ -203,7 +203,7 @@ if (isset($_POST['add_ticket_feedback'])) {
         header("Location: " . $_SERVER["HTTP_REFERER"]);
     } else {
         // The client does not have access to this ticket
-        header("Location: portal_post.php?logout");
+        header("Location: post.php?logout");
         exit();
     }
 
@@ -332,7 +332,7 @@ if (isset($_POST['edit_profile'])) {
 if (isset($_POST['add_contact'])) {
 
     if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) {
-        header("Location: portal_post.php?logout");
+        header("Location: post.php?logout");
         exit();
     }
 
@@ -379,7 +379,7 @@ if (isset($_POST['add_contact'])) {
 if (isset($_POST['edit_contact'])) {
 
     if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) {
-        header("Location: portal_post.php?logout");
+        header("Location: post.php?logout");
         exit();
     }
 
@@ -432,7 +432,7 @@ if (isset($_POST['edit_contact'])) {
 if (isset($_POST['create_stripe_customer'])) {
 
     if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) {
-        header("Location: portal_post.php?logout");
+        header("Location: post.php?logout");
         exit();
     }
 
@@ -496,7 +496,7 @@ if (isset($_GET['create_stripe_checkout'])) {
     // This page is called by the autopay_setup_stripe.js, it returns a checkout session client secret
 
     if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) {
-        header("Location: portal_post.php?logout");
+        header("Location: post.php?logout");
         exit();
     }
 
@@ -515,7 +515,7 @@ if (isset($_GET['create_stripe_checkout'])) {
     $client_currency = $client_currency_details['client_currency_code'];
 
     // Define return URL that user is redirected to once payment method is verified by Stripe
-    $return_url = "https://$config_base_url/portal/portal_post.php?stripe_save_card&session_id={CHECKOUT_SESSION_ID}";
+    $return_url = "https://$config_base_url/client/post.php?stripe_save_card&session_id={CHECKOUT_SESSION_ID}";
 
     try {
         // Initialize stripe
@@ -544,7 +544,7 @@ if (isset($_GET['create_stripe_checkout'])) {
 if (isset($_GET['stripe_save_card'])) {
 
     if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) {
-        header("Location: portal_post.php?logout");
+        header("Location: post.php?logout");
         exit();
     }
 
@@ -644,7 +644,7 @@ if (isset($_GET['stripe_save_card'])) {
 if (isset($_GET['stripe_remove_card'])) {
 
     if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) {
-        header("Location: portal_post.php?logout");
+        header("Location: post.php?logout");
         exit();
     }
 
diff --git a/portal/profile.php b/client/profile.php
similarity index 92%
rename from portal/profile.php
rename to client/profile.php
index 60089277..6209fed5 100644
--- a/portal/profile.php
+++ b/client/profile.php
@@ -6,7 +6,7 @@
 
 header("Content-Security-Policy: default-src 'self'");
 
-require_once 'inc_portal.php';
+require_once 'includes/inc_all.php';
 
 ?>
 
@@ -30,7 +30,7 @@ require_once 'inc_portal.php';
     <hr>
     <div class="col-md-6">
         <h4>Password</h4>
-        <form action="portal_post.php" method="post" autocomplete="off">
+        <form action="post.php" method="post" autocomplete="off">
             <div class="form-group">
                 <label>New Password</label>
                 <div class="input-group">
@@ -46,5 +46,5 @@ require_once 'inc_portal.php';
 <?php endif ?>
 
 <?php
-require_once 'portal_footer.php';
+require_once 'includes/footer.php';
 
diff --git a/portal/quotes.php b/client/quotes.php
similarity index 91%
rename from portal/quotes.php
rename to client/quotes.php
index 91f12108..1c96c523 100644
--- a/portal/quotes.php
+++ b/client/quotes.php
@@ -6,10 +6,10 @@
 
 header("Content-Security-Policy: default-src 'self'");
 
-require_once "inc_portal.php";
+require_once "includes/inc_all.php";
 
 if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) {
-    header("Location: portal_post.php?logout");
+    header("Location: post.php?logout");
     exit();
 }
 
@@ -67,7 +67,7 @@ $quotes_sql = mysqli_query($mysqli, "SELECT * FROM quotes WHERE quote_client_id
                 ?>
 
                 <tr>
-                    <td><a target="_blank" href="//<?php echo $config_base_url ?>/guest_view_quote.php?quote_id=<?php echo "$quote_id&url_key=$quote_url_key"?>"> <?php echo "$quote_prefix$quote_number"; ?></a></td>
+                    <td><a target="_blank" href="//<?php echo $config_base_url ?>/guest/guest_view_quote.php?quote_id=<?php echo "$quote_id&url_key=$quote_url_key"?>"> <?php echo "$quote_prefix$quote_number"; ?></a></td>
                     <td><?php echo $quote_scope_display; ?></td>
                     <td><?php echo numfmt_format_currency($currency_format, $quote_amount, $session_company_currency); ?></td>
                     <td><?php echo $quote_date; ?></td>
@@ -88,4 +88,4 @@ $quotes_sql = mysqli_query($mysqli, "SELECT * FROM quotes WHERE quote_client_id
 </div>
 
 <?php
-require_once "portal_footer.php";
+require_once "includes/footer.php";
diff --git a/portal/ticket.php b/client/ticket.php
similarity index 93%
rename from portal/ticket.php
rename to client/ticket.php
index 7d2efd29..2373031c 100644
--- a/portal/ticket.php
+++ b/client/ticket.php
@@ -4,7 +4,7 @@
  * Ticket detail page
  */
 
-require_once "inc_portal.php";
+require_once "includes/inc_all.php";
 
 //Initialize the HTML Purifier to prevent XSS
 require "../plugins/htmlpurifier/HTMLPurifier.standalone.php";
@@ -91,7 +91,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
                     Ticket <?php echo $ticket_prefix, $ticket_number ?>
                     <?php
                     if (empty($ticket_resolved_at) && $task_count == $completed_task_count) { ?>
-                        <a href="portal_post.php?resolve_ticket=<?php echo $ticket_id; ?>" class="btn btn-sm btn-outline-success float-right text-white confirm-link"><i class="fas fa-fw fa-check text-success"></i> Resolve ticket</a>
+                        <a href="post.php?resolve_ticket=<?php echo $ticket_id; ?>" class="btn btn-sm btn-outline-success float-right text-white confirm-link"><i class="fas fa-fw fa-check text-success"></i> Resolve ticket</a>
                     <?php } ?>
                 </h4>
             </div>
@@ -135,7 +135,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
         <?php if (empty($ticket_resolved_at)) { ?>
             <!-- Reply -->
 
-            <form action="portal_post.php" enctype="multipart/form-data" method="post">
+            <form action="post.php" enctype="multipart/form-data" method="post">
                 <input type="hidden" name="ticket_id" value="<?php echo $ticket_id ?>">
                 <div class="form-group">
                     <textarea class="form-control tinymce" name="comment" placeholder="Add comments.."></textarea>
@@ -154,11 +154,11 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
             <div class="col-6">
                 <div class="row">
                     <div class="col">
-                        <a href="portal_post.php?reopen_ticket=<?php echo $ticket_id; ?>" class="btn btn-secondary btn-lg"><i class="fas fa-fw fa-redo text-white"></i> Reopen ticket</a>
+                        <a href="post.php?reopen_ticket=<?php echo $ticket_id; ?>" class="btn btn-secondary btn-lg"><i class="fas fa-fw fa-redo text-white"></i> Reopen ticket</a>
                     </div>
 
                     <div class="col">
-                        <a href="portal_post.php?close_ticket=<?php echo $ticket_id; ?>" class="btn btn-success btn-lg confirm-link"><i class="fas fa-fw fa-gavel text-white"></i> Close ticket</a>
+                        <a href="post.php?close_ticket=<?php echo $ticket_id; ?>" class="btn btn-success btn-lg confirm-link"><i class="fas fa-fw fa-gavel text-white"></i> Close ticket</a>
                     </div>
                 </div>
             </div>
@@ -168,7 +168,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
 
             <h4>Ticket closed. Please rate your ticket</h4>
 
-            <form action="portal_post.php" method="post">
+            <form action="post.php" method="post">
                 <input type="hidden" name="ticket_id" value="<?php echo $ticket_id ?>">
 
                 <button type="submit" class="btn btn-primary btn-lg" name="add_ticket_feedback" value="Good" onclick="this.form.submit()">
@@ -282,6 +282,6 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
     header("Location: index.php");
 }
 
-require_once "portal_footer.php";
+require_once "includes/footer.php";
 
 
diff --git a/portal/ticket_add.php b/client/ticket_add.php
similarity index 93%
rename from portal/ticket_add.php
rename to client/ticket_add.php
index 8993a6a3..67aa2969 100644
--- a/portal/ticket_add.php
+++ b/client/ticket_add.php
@@ -4,7 +4,7 @@
  * New ticket form
  */
 
-require_once 'inc_portal.php';
+require_once 'includes/inc_all.php';
 
 ?>
 
@@ -21,7 +21,7 @@ require_once 'inc_portal.php';
     <h3>Raise a new ticket</h3>
 
     <div class="col-md-8">
-        <form action="portal_post.php" method="post">
+        <form action="post.php" method="post">
 
             <div class="form-group">
                 <label>Subject <strong class="text-danger">*</strong></label>
@@ -58,5 +58,5 @@ require_once 'inc_portal.php';
     </div>
 
 <?php
-require_once 'portal_footer.php';
+require_once 'includes/footer.php';
 
diff --git a/portal/ticket_view_all.php b/client/ticket_view_all.php
similarity index 96%
rename from portal/ticket_view_all.php
rename to client/ticket_view_all.php
index 9092632a..50812f3b 100644
--- a/portal/ticket_view_all.php
+++ b/client/ticket_view_all.php
@@ -4,11 +4,11 @@
  * Primary contact view: all tickets
  */
 
-require_once 'inc_portal.php';
+require_once 'includes/inc_all.php';
 
 
 if ($session_contact_primary == 0 && !$session_contact_is_technical_contact) {
-    header("Location: portal_post.php?logout");
+    header("Location: post.php?logout");
     exit();
 }
 
@@ -74,5 +74,5 @@ $all_tickets = mysqli_query($mysqli, "SELECT ticket_id, ticket_prefix, ticket_nu
     </div>
 
 <?php
-require_once 'portal_footer.php';
+require_once 'includes/footer.php';
 
diff --git a/portal/tickets.php b/client/tickets.php
similarity index 98%
rename from portal/tickets.php
rename to client/tickets.php
index ab88d1b0..63cde656 100644
--- a/portal/tickets.php
+++ b/client/tickets.php
@@ -6,7 +6,7 @@
 
 header("Content-Security-Policy: default-src 'self'");
 
-require_once "inc_portal.php";
+require_once "includes/inc_all.php";
 
 
 // Ticket status from GET
@@ -109,5 +109,5 @@ $total_tickets = intval($row['total_tickets']);
     </div>
 </div>
 
-<?php require_once "portal_footer.php";
+<?php require_once "includes/footer.php";
  ?>
diff --git a/cron.php b/cron.php
index 21434f9a..40d5312e 100644
--- a/cron.php
+++ b/cron.php
@@ -329,7 +329,7 @@ if (mysqli_num_rows($sql_scheduled_tickets) > 0) {
         if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1 && filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
 
             $email_subject = "Ticket created - [$ticket_prefix$ticket_number] - $ticket_subject (scheduled)";
-            $email_body = "<i style=\'color: #808080\'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>A ticket regarding \"$ticket_subject\" has been automatically created for you.<br><br>--------------------------------<br>$ticket_details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: https://$config_base_url/portal/ticket.php?id=$id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
+            $email_body = "<i style=\'color: #808080\'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>A ticket regarding \"$ticket_subject\" has been automatically created for you.<br><br>--------------------------------<br>$ticket_details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: https://$config_base_url/client/ticket.php?id=$id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
 
             $email = [
                     'from' => $config_ticket_from_email,
diff --git a/cron_ticket_email_parser.php b/cron_ticket_email_parser.php
index 69daefbc..61bcca50 100644
--- a/cron_ticket_email_parser.php
+++ b/cron_ticket_email_parser.php
@@ -155,7 +155,7 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date
     $data = [];
     if ($config_ticket_client_general_notifications == 1) {
         $subject_email = "Ticket created - [$config_ticket_prefix$ticket_number] - $subject";
-        $body = "<i style='color: #808080'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>Thank you for your email. A ticket regarding \"$subject\" has been automatically created for you.<br><br>Ticket: $config_ticket_prefix$ticket_number<br>Subject: $subject<br>Status: New<br>https://$config_base_url/portal/ticket.php?id=$id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
+        $body = "<i style='color: #808080'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>Thank you for your email. A ticket regarding \"$subject\" has been automatically created for you.<br><br>Ticket: $config_ticket_prefix$ticket_number<br>Subject: $subject<br>Status: New<br>https://$config_base_url/client/ticket.php?id=$id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
         $data[] = [
             'from' => $config_ticket_from_email,
             'from_name' => $config_ticket_from_name,
diff --git a/login.php b/login.php
index 87c48235..5b8602e3 100644
--- a/login.php
+++ b/login.php
@@ -383,7 +383,7 @@ if (isset($_POST['login'])) {
 
                 <?php if($config_client_portal_enable == 1){ ?>
                     <hr>
-                    <h5 class="text-center">Looking for the <a href="portal">Client Portal?<a/></h5>
+                    <h5 class="text-center">Looking for the <a href="client">Client Portal?<a/></h5>
                 <?php } ?>
 
             </form>
diff --git a/post/user/contact.php b/post/user/contact.php
index 63f3358d..4815bba4 100644
--- a/post/user/contact.php
+++ b/post/user/contact.php
@@ -182,13 +182,13 @@ if (isset($_POST['edit_contact'])) {
         if ($auth_method == 'azure') {
             $password_info = "Login with your Microsoft (Azure AD) account.";
         } elseif (empty($_POST['contact_password'])) {
-            $password_info = "Request a password reset at https://$config_base_url/portal/login_reset.php";
+            $password_info = "Request a password reset at https://$config_base_url/client/login_reset.php";
         } else {
             $password_info = mysqli_real_escape_string($mysqli, $_POST['contact_password'] . " -- Please change on first login");
         }
 
         $subject = "Your new $company_name portal account";
-        $body = "Hello $name,<br><br>$company_name has created a support portal account for you. <br><br>Username: $email<br>Password: $password_info<br><br>Login URL: https://$config_base_url/portal/<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
+        $body = "Hello $name,<br><br>$company_name has created a support portal account for you. <br><br>Username: $email<br>Password: $password_info<br><br>Login URL: https://$config_base_url/client/<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
 
         // Queue Mail
         $data = [
diff --git a/post/user/ticket.php b/post/user/ticket.php
index bd358d11..5f66f9c6 100644
--- a/post/user/ticket.php
+++ b/post/user/ticket.php
@@ -961,7 +961,7 @@ if (isset($_POST['bulk_resolve_tickets'])) {
 
                 // EMAIL
                 $subject = "Ticket resolved - [$ticket_prefix$ticket_number] - $ticket_subject | (pending closure)";
-                $body = "<i style=\'color: #808080\'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>Your ticket regarding \"$ticket_subject\" has been marked as solved and is pending closure.<br><br>$details<br><br> If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or <a href=\'https://$config_base_url/guest/guest_view_ticket.php?ticket_id=$ticket_id&url_key=$url_key\'>re-open</a> to let us know! <br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Portal: https://$base_url/portal/ticket.php?id=$ticket_id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
+                $body = "<i style=\'color: #808080\'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>Your ticket regarding \"$ticket_subject\" has been marked as solved and is pending closure.<br><br>$details<br><br> If your request/issue is resolved, you can simply ignore this email. If you need further assistance, please reply or <a href=\'https://$config_base_url/guest/guest_view_ticket.php?ticket_id=$ticket_id&url_key=$url_key\'>re-open</a> to let us know! <br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Portal: https://$base_url/client/ticket.php?id=$ticket_id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
 
                 // Check email valid
                 if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
@@ -1758,7 +1758,7 @@ if (isset($_GET['close_ticket'])) {
         // EMAIL
         $subject = "Ticket closed - [$ticket_prefix$ticket_number] - $ticket_subject | (do not reply)";
             //$body = "Hello $contact_name,<br><br>Your ticket regarding \"$ticket_subject\" has been closed. <br><br> We hope the request/issue was resolved to your satisfaction. If you need further assistance, please raise a new ticket using the below details. Please do not reply to this email. <br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Portal: https://$config_base_url/portal/ticket.php?id=$ticket_id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
-        $body = "Hello $contact_name,<br><br>Your ticket regarding \"$ticket_subject\" has been closed. <br><br> We hope the request/issue was resolved to your satisfaction, please provide your feedback <a href=\'https://$config_base_url/guest/guest_view_ticket.php?ticket_id=$ticket_id&url_key=$url_key\'>here</a>. <br>If you need further assistance, please raise a new ticket using the below details. Please do not reply to this email. <br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Portal: https://$config_base_url/portal/ticket.php?id=$ticket_id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
+        $body = "Hello $contact_name,<br><br>Your ticket regarding \"$ticket_subject\" has been closed. <br><br> We hope the request/issue was resolved to your satisfaction, please provide your feedback <a href=\'https://$config_base_url/guest/guest_view_ticket.php?ticket_id=$ticket_id&url_key=$url_key\'>here</a>. <br>If you need further assistance, please raise a new ticket using the below details. Please do not reply to this email. <br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Portal: https://$config_base_url/client/ticket.php?id=$ticket_id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
 
         // Check email valid
         if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
@@ -2087,7 +2087,7 @@ if (isset($_GET['force_recurring_ticket'])) {
         if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1 && filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
 
             $email_subject = "Ticket created - [$ticket_prefix$ticket_number] - $ticket_subject (scheduled)";
-            $email_body = "<i style=\'color: #808080\'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>A ticket regarding \"$ticket_subject\" has been automatically created for you.<br><br>--------------------------------<br>$ticket_details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: https://$config_base_url/portal/ticket.php?id=$id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
+            $email_body = "<i style=\'color: #808080\'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>A ticket regarding \"$ticket_subject\" has been automatically created for you.<br><br>--------------------------------<br>$ticket_details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: https://$config_base_url/client/ticket.php?id=$id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
 
             $email = [
                 'from' => $config_ticket_from_email,
@@ -2230,7 +2230,7 @@ if (isset($_POST['edit_ticket_schedule'])) {
     $onsite = intval($_POST['onsite']);
     $schedule = sanitizeInput($_POST['scheduled_date_time']);
     $ticket_link = "ticket.php?ticket_id=$ticket_id";
-    $full_ticket_url = "https://$config_base_url/portal/ticket.php?ticket_id=$ticket_id";
+    $full_ticket_url = "https://$config_base_url/client/ticket.php?ticket_id=$ticket_id";
     $ticket_link_html = "<a href=\"$full_ticket_url\">$ticket_link</a>";
 
     mysqli_query($mysqli,"UPDATE tickets 
@@ -2309,7 +2309,7 @@ if (isset($_POST['edit_ticket_schedule'])) {
                             </div>
                             Your ticket regarding $ticket_subject has been scheduled for $email_datetime.
                             <br><br>
-                            <a href='https://$config_base_url/portal/ticket.php?id=$ticket_id' class='link-button'>Access your ticket here</a>
+                            <a href='https://$config_base_url/client/ticket.php?id=$ticket_id' class='link-button'>Access your ticket here</a>
                             <br><br>
                             Please do not reply to this email.
                             <br><br>
@@ -2344,13 +2344,13 @@ if (isset($_POST['edit_ticket_schedule'])) {
         </div>
         The ticket regarding $ticket_subject has been scheduled for $email_datetime.
         <br><br>
-        <a href='https://$config_base_url/portal/ticket.php?id=$ticket_id' class='link-button'>$ticket_link</a>
+        <a href='https://$config_base_url/client/ticket.php?id=$ticket_id' class='link-button'>$ticket_link</a>
         <br><br>
         Please do not reply to this email.
         <br><br>
         <strong>Ticket:</strong> $ticket_prefix$ticket_number<br>
         <strong>Subject:</strong> $ticket_subject<br>
-        <strong>Portal:</strong> <a href='https://$config_base_url/portal/ticket.php?id=$ticket_id'>Access the ticket here</a>
+        <strong>Portal:</strong> <a href='https://$config_base_url/client/ticket.php?id=$ticket_id'>Access the ticket here</a>
         <br><br>
         <div class='footer'>
             ~<br>
@@ -2462,7 +2462,7 @@ if (isset($_GET['cancel_ticket_schedule'])) {
                             </div>
                             Scheduled work for your ticket regarding $ticket_subject has been cancelled.
                             <br><br>
-                            <a href='https://$config_base_url/portal/ticket.php?id=$ticket_id' class='link-button'>Access your ticket here</a>
+                            <a href='https://$config_base_url/client/ticket.php?id=$ticket_id' class='link-button'>Access your ticket here</a>
                             <br><br>
                             Please do not reply to this email.
                             <br><br>
@@ -2496,13 +2496,13 @@ if (isset($_GET['cancel_ticket_schedule'])) {
         </div>
         Scheduled work for the ticket regarding $ticket_subject has been cancelled.
         <br><br>
-        <a href='https://$config_base_url/portal/ticket.php?id=$ticket_id' class='link-button'>$ticket_link</a>
+        <a href='https://$config_base_url/client/ticket.php?id=$ticket_id' class='link-button'>$ticket_link</a>
         <br><br>
         Please do not reply to this email.
         <br><br>
         <strong>Ticket:</strong> $ticket_prefix$ticket_number<br>
         <strong>Subject:</strong> $ticket_subject<br>
-        <strong>Portal:</strong> <a href='https://$config_base_url/portal/ticket.php?id=$ticket_id'>Access the ticket here</a>
+        <strong>Portal:</strong> <a href='https://$config_base_url/client/ticket.php?id=$ticket_id'>Access the ticket here</a>
         <br><br>
         <div class='footer'>
             ~<br>
diff --git a/scripts/cron.php b/scripts/cron.php
index d88c2950..e48fbc1d 100644
--- a/scripts/cron.php
+++ b/scripts/cron.php
@@ -351,7 +351,7 @@ if (mysqli_num_rows($sql_scheduled_tickets) > 0) {
         if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1 && filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
 
             $email_subject = "Ticket created - [$ticket_prefix$ticket_number] - $ticket_subject (scheduled)";
-            $email_body = "<i style=\'color: #808080\'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>A ticket regarding \"$ticket_subject\" has been automatically created for you.<br><br>--------------------------------<br>$ticket_details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: https://$config_base_url/portal/ticket.php?id=$id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
+            $email_body = "<i style=\'color: #808080\'>##- Please type your reply above this line -##</i><br><br>Hello $contact_name,<br><br>A ticket regarding \"$ticket_subject\" has been automatically created for you.<br><br>--------------------------------<br>$ticket_details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: https://$config_base_url/client/ticket.php?id=$id<br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
 
             $email = [
                     'from' => $config_ticket_from_email,