From 29db5a19c93ce4d7e1b5cda910cabbf91afb7d53 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 24 Feb 2023 21:30:30 -0500 Subject: [PATCH] Fixed undefine vendor_id and asset_id under tickets --- client_contact_details.php | 1 + client_contact_details_modal.php | 121 ------------ client_domains.php | 4 +- client_logins.php | 10 +- client_software_templates.php | 122 ------------ client_vendor_templates.php | 174 ------------------ ...> settings_software_template_add_modal.php | 1 - ... settings_software_template_edit_modal.php | 0 settings_software_templates.php | 5 +- settings_vendor_templates.php | 1 - tickets.php | 4 + 11 files changed, 13 insertions(+), 430 deletions(-) delete mode 100644 client_contact_details_modal.php delete mode 100644 client_software_templates.php delete mode 100644 client_vendor_templates.php rename client_software_template_add_modal.php => settings_software_template_add_modal.php (97%) rename client_software_template_edit_modal.php => settings_software_template_edit_modal.php (100%) diff --git a/client_contact_details.php b/client_contact_details.php index d53d7a95..4eaf91da 100644 --- a/client_contact_details.php +++ b/client_contact_details.php @@ -308,6 +308,7 @@ if (isset($_GET['contact_id'])) { $otp_display = " Hover.."; } $login_note = htmlentities($row['login_note']); + $login_important = intval($row['login_important']); $login_contact_id = intval($row['login_contact_id']); $login_vendor_id = intval($row['login_vendor_id']); $login_asset_id = intval($row['login_asset_id']); diff --git a/client_contact_details_modal.php b/client_contact_details_modal.php deleted file mode 100644 index bba28ff4..00000000 --- a/client_contact_details_modal.php +++ /dev/null @@ -1,121 +0,0 @@ - diff --git a/client_domains.php b/client_domains.php index 82c59c3e..054afd26 100644 --- a/client_domains.php +++ b/client_domains.php @@ -65,8 +65,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); while ($row = mysqli_fetch_array($sql)) { $domain_id = intval($row['domain_id']); $domain_name = htmlentities($row['domain_name']); - $domain_registrar = htmlentities($row['domain_registrar']); - $domain_webhost = htmlentities($row['domain_webhost']); + $domain_registrar = intval($row['domain_registrar']); + $domain_webhost = intval($row['domain_webhost']); $domain_expire = htmlentities($row['domain_expire']); $domain_registrar_name = htmlentities($row['vendor_name']); if (empty($domain_registrar_name)) { diff --git a/client_logins.php b/client_logins.php index 863ee58d..858a9f61 100644 --- a/client_logins.php +++ b/client_logins.php @@ -1,12 +1,10 @@ $sb, 'o' => $o))); diff --git a/client_software_templates.php b/client_software_templates.php deleted file mode 100644 index f4911d09..00000000 --- a/client_software_templates.php +++ /dev/null @@ -1,122 +0,0 @@ - $sb, 'o' => $o))); - -$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM software - LEFT JOIN logins ON login_software_id = software_id - WHERE software_template = 1 - AND (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%') - ORDER BY $sb $o LIMIT $record_from, $record_to"); - -$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - -?> - -
-
-

Licenses Templates

- -
- Licenses -
-
- -
-
-
-
- -
- -
-
- -
- -
-
-
- -
-
- -
-
-
-
- - "> - - - - - - - - - - - - - - - - - - - - - -
TemplateTypeLicense TypeSeatsAction
$software_version"; ?> -
- -
- - Edit - - -
- - Delete - - -
-
-
-
- -
-
- - $sb, 'o' => $o))); - -$sql = mysqli_query( - $mysqli, - "SELECT SQL_CALC_FOUND_ROWS * FROM vendors - WHERE vendor_template = 1 - AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number LIKE '%$q%' OR vendor_website LIKE '%$q%' OR vendor_contact_name LIKE '%$q%' OR vendor_email LIKE '%$q%' OR vendor_phone LIKE '%$phone_query%') ORDER BY $sb $o LIMIT $record_from, $record_to" -); - -$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - -?> - -
-
-

- Vendor Templates -

- -
- Vendors -
-
- -
-
-
-
- -
- -
-
- -
- -
-
-
- -
-
-
-
- - "> - - - - - - - - - - - - - - - - - - - -
VendorDescriptionContactAction
- - - -
- - - 		- - -
- - -
- - -
- - 		-
- -
- - Edit - - -
- - Delete - - -
-
-
-
- -
-
- -
-
diff --git a/client_software_template_edit_modal.php b/settings_software_template_edit_modal.php similarity index 100% rename from client_software_template_edit_modal.php rename to settings_software_template_edit_modal.php diff --git a/settings_software_templates.php b/settings_software_templates.php index a1e5a2cb..64937f84 100644 --- a/settings_software_templates.php +++ b/settings_software_templates.php @@ -31,7 +31,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
@@ -103,7 +102,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); @@ -116,5 +115,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
diff --git a/tickets.php b/tickets.php index 9c7f8a02..2fafdc76 100644 --- a/tickets.php +++ b/tickets.php @@ -46,6 +46,7 @@ $sql = mysqli_query( LEFT JOIN users ON ticket_assigned_to = user_id LEFT JOIN assets ON ticket_asset_id = asset_id LEFT JOIN locations ON ticket_location_id = location_id + LEFT JOIN vendors ON ticket_vendor_id = vendor_id WHERE tickets.company_id = $session_company_id AND ticket_assigned_to LIKE '%$ticket_assigned_filter%' AND $ticket_status_snippet @@ -326,6 +327,9 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']); $contact_display = "$contact_name
$contact_email"; } + $asset_id = intval($row['asset_id']); + $vendor_id = intval($row['vendor_id']); + ?>