From d29726f63ed591c974adc268f76a78f21266f998 Mon Sep 17 00:00:00 2001
From: Marcus Hill <bcf8c9f2@opayq.com>
Date: Sun, 17 Mar 2024 18:51:56 +0000
Subject: [PATCH] Bugfix: Contact generated passwords are in quotes

Fixing as per https://forum.itflow.org/d/760-password-generator-include-at-start-and-end
---
 client_contact_details.php | 27 ++++++++++++---------------
 client_contacts.php        | 23 ++++++++++-------------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/client_contact_details.php b/client_contact_details.php
index 6eeaffd6..3f1a71d2 100644
--- a/client_contact_details.php
+++ b/client_contact_details.php
@@ -221,12 +221,12 @@ if (isset($_GET['contact_id'])) {
                                     <td><?php echo $asset_type; ?></td>
                                     <td>
                                         <?php echo $asset_make; ?>
-                                        <div class="mt-0"> 
+                                        <div class="mt-0">
                                             <small class="text-muted"><?php echo $asset_model; ?></small>
                                         </div>
                                     </td>
                                     <td><?php echo $asset_serial_display; ?></td>
-                                    
+
                                     <td><?php echo $asset_install_date_display; ?></td>
                                     <td><?php echo $asset_status; ?></td>
                                     <td>
@@ -580,26 +580,23 @@ if (isset($_GET['contact_id'])) {
     <script>
 
         function generatePassword(type, id) {
-            var url = '/ajax.php?get_readable_pass=true';
+            // Send a GET request to ajax.php as ajax.php?get_readable_pass=true
+            jQuery.get(
+                "ajax.php", {
+                    get_readable_pass: 'true'
+                },
+                function(data) {
+                    //If we get a response from post.php, parse it as JSON
+                    const password = JSON.parse(data);
 
-            // Make an AJAX request to the server
-            var xhr = new XMLHttpRequest();
-            xhr.open('GET', url, true);
-
-            xhr.onreadystatechange = function () {
-                if (xhr.readyState == 4 && xhr.status == 200) {
-                    var password = xhr.responseText;
-
-                    // Set the password value based on the type
+                    // Set the password value to the correct modal, based on the type
                     if (type == "add") {
                         document.getElementById("password-add").value = password;
                     } else if (type == "edit") {
-                        console.log("password-edit-"+id.toString());
                         document.getElementById("password-edit-"+id.toString()).value = password;
                     }
                 }
-            };
-            xhr.send();
+            );
         }
 
         $(document).ready(function() {
diff --git a/client_contacts.php b/client_contacts.php
index 8a1c9535..91359a96 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -293,26 +293,23 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script>
 
     function generatePassword(type, id) {
-        var url = '/ajax.php?get_readable_pass=true';
+        // Send a GET request to ajax.php as ajax.php?get_readable_pass=true
+        jQuery.get(
+            "ajax.php", {
+                get_readable_pass: 'true'
+            },
+            function(data) {
+                //If we get a response from post.php, parse it as JSON
+                const password = JSON.parse(data);
 
-        // Make an AJAX request to the server
-        var xhr = new XMLHttpRequest();
-        xhr.open('GET', url, true);
-
-        xhr.onreadystatechange = function () {
-            if (xhr.readyState == 4 && xhr.status == 200) {
-                var password = xhr.responseText;
-
-                // Set the password value based on the type
+                // Set the password value to the correct modal, based on the type
                 if (type == "add") {
                     document.getElementById("password-add").value = password;
                 } else if (type == "edit") {
-                    console.log("password-edit-"+id.toString());
                     document.getElementById("password-edit-"+id.toString()).value = password;
                 }
             }
-        };
-        xhr.send();
+        );
     }
 
     $(document).ready(function() {