From b2fff24bd94fa5be517270ba5dab317b1a39c87f Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sun, 17 Nov 2024 14:33:31 -0500 Subject: [PATCH] Change theme on click now instead of selecting them then hitting submit more ?? 0s for the form checkboxes --- admin_custom_link_add_modal.php | 2 -- admin_custom_link_edit_modal.php | 2 ++ admin_settings_theme.php | 6 +----- client_add_modal.php | 3 --- client_contact_edit_modal.php | 7 ------- client_edit_modal.php | 8 +------- client_login_add_modal.php | 2 +- post/admin/admin_custom_link.php | 8 ++++---- post/admin/admin_settings_theme.php | 7 +------ post/admin/admin_user_model.php | 2 +- post/user/asset.php | 2 +- post/user/asset_model.php | 3 ++- post/user/client_model.php | 6 +++--- post/user/contact.php | 2 +- post/user/credential_model.php | 2 +- post/user/trip_model.php | 2 +- trip_add_modal.php | 2 +- trip_edit_modal.php | 1 - 18 files changed, 21 insertions(+), 46 deletions(-) diff --git a/admin_custom_link_add_modal.php b/admin_custom_link_add_modal.php index aecda31d..b10a3a4a 100644 --- a/admin_custom_link_add_modal.php +++ b/admin_custom_link_add_modal.php @@ -9,8 +9,6 @@
- -
diff --git a/admin_custom_link_edit_modal.php b/admin_custom_link_edit_modal.php index d2be695c..63124b91 100644 --- a/admin_custom_link_edit_modal.php +++ b/admin_custom_link_edit_modal.php @@ -8,7 +8,9 @@
+ +
diff --git a/admin_settings_theme.php b/admin_settings_theme.php index a503a85e..9ac12a36 100644 --- a/admin_settings_theme.php +++ b/admin_settings_theme.php @@ -22,7 +22,7 @@ require_once "inc_all_admin.php";
- > + >
-
- - -
diff --git a/client_add_modal.php b/client_add_modal.php index 01de5a94..4bc71c1e 100644 --- a/client_add_modal.php +++ b/client_add_modal.php @@ -9,9 +9,6 @@
- - -
    diff --git a/client_contact_edit_modal.php b/client_contact_edit_modal.php index 762748bf..aa3ea01f 100644 --- a/client_contact_edit_modal.php +++ b/client_contact_edit_modal.php @@ -8,13 +8,6 @@
- - - - - - -
diff --git a/client_edit_modal.php b/client_edit_modal.php index bdac5dbb..eedaa4ea 100644 --- a/client_edit_modal.php +++ b/client_edit_modal.php @@ -11,13 +11,7 @@
- - - +
    diff --git a/client_login_add_modal.php b/client_login_add_modal.php index b81b3a0d..8ce5edd0 100644 --- a/client_login_add_modal.php +++ b/client_login_add_modal.php @@ -9,7 +9,7 @@
- +
    diff --git a/post/admin/admin_custom_link.php b/post/admin/admin_custom_link.php index a49c2975..92c882f4 100644 --- a/post/admin/admin_custom_link.php +++ b/post/admin/admin_custom_link.php @@ -8,9 +8,9 @@ if (isset($_POST['add_custom_link'])) { $name = sanitizeInput($_POST['name']); $uri = sanitizeInput($_POST['uri']); - $new_tab = intval($_POST['new_tab']); + $new_tab = intval($_POST['new_tab'] ?? 0); $icon = preg_replace("/[^0-9a-zA-Z-]/", "", sanitizeInput($_POST['icon'])); - $order = intval($_POST['order']); + $order = intval($_POST['order'] ?? 0); $location = intval($_POST['location']); mysqli_query($mysqli,"INSERT INTO custom_links SET custom_link_name = '$name', custom_link_uri = '$uri', custom_link_new_tab = $new_tab, custom_link_icon = '$icon', custom_link_order = $order, custom_link_location = $location"); @@ -31,9 +31,9 @@ if (isset($_POST['edit_custom_link'])) { $custom_link_id = intval($_POST['custom_link_id']); $name = sanitizeInput($_POST['name']); $uri = sanitizeInput($_POST['uri']); - $new_tab = intval($_POST['new_tab']); + $new_tab = intval($_POST['new_tab'] ?? 0); $icon = preg_replace("/[^0-9a-zA-Z-]/", "", sanitizeInput($_POST['icon'])); - $order = intval($_POST['order']); + $order = intval($_POST['order'] ?? 0); $location = intval($_POST['location']); mysqli_query($mysqli,"UPDATE custom_links SET custom_link_name = '$name', custom_link_uri = '$uri', custom_link_new_tab = $new_tab, custom_link_icon = '$icon', custom_link_order = $order, custom_link_location = $location WHERE custom_link_id = $custom_link_id"); diff --git a/post/admin/admin_settings_theme.php b/post/admin/admin_settings_theme.php index 0f341353..08f49589 100644 --- a/post/admin/admin_settings_theme.php +++ b/post/admin/admin_settings_theme.php @@ -4,7 +4,7 @@ if (isset($_POST['edit_theme_settings'])) { validateCSRFToken($_POST['csrf_token']); - $theme = preg_replace("/[^0-9a-zA-Z-]/", "", sanitizeInput($_POST['theme'])); + $theme = preg_replace("/[^0-9a-zA-Z-]/", "", sanitizeInput($_POST['edit_theme_settings'])); mysqli_query($mysqli,"UPDATE settings SET config_theme = '$theme' WHERE company_id = 1"); @@ -37,11 +37,6 @@ if (isset($_POST['edit_favicon_settings'])) { $dest_path = $upload_file_dir . $new_file_name; move_uploaded_file($file_tmp_path, $dest_path); - - $_SESSION['alert_message'] = 'File successfully uploaded.'; - }else{ - - $_SESSION['alert_message'] = 'There was an error moving the file to upload directory. Please make sure the upload directory is writable by web server.'; } } diff --git a/post/admin/admin_user_model.php b/post/admin/admin_user_model.php index 00c9a402..8b4b9eb2 100644 --- a/post/admin/admin_user_model.php +++ b/post/admin/admin_user_model.php @@ -2,4 +2,4 @@ $name = sanitizeInput($_POST['name']); $email = sanitizeInput($_POST['email']); $role = intval($_POST['role']); -$force_mfa = intval($_POST['force_mfa']); +$force_mfa = intval($_POST['force_mfa'] ?? 0); diff --git a/post/user/asset.php b/post/user/asset.php index b7134e23..f1aaebe1 100644 --- a/post/user/asset.php +++ b/post/user/asset.php @@ -59,7 +59,7 @@ if (isset($_POST['add_asset'])) { mysqli_query($mysqli,"INSERT INTO asset_history SET asset_history_status = '$status', asset_history_description = '$session_name created $name', asset_history_asset_id = $asset_id"); //Logging - logAction("Asset", "Create", "$session_name created asset $asset_name", $client_id, $asset_id); + logAction("Asset", "Create", "$session_name created asset $name", $client_id, $asset_id); $_SESSION['alert_message'] = "Asset $name created $alert_extended"; diff --git a/post/user/asset_model.php b/post/user/asset_model.php index e620457a..88a25b8f 100644 --- a/post/user/asset_model.php +++ b/post/user/asset_model.php @@ -7,7 +7,8 @@ $model = sanitizeInput($_POST['model']); $serial = sanitizeInput($_POST['serial']); $os = sanitizeInput($_POST['os']); $ip = sanitizeInput($_POST['ip']); -if ($_POST['dhcp'] == 1) { +$dhcp = intval($_POST['dhcp'] ?? 0); +if ($dhcp == 1) { $ip = 'DHCP'; } $ipv6 = sanitizeInput($_POST['ipv6']); diff --git a/post/user/client_model.php b/post/user/client_model.php index f02fb066..5cc65906 100644 --- a/post/user/client_model.php +++ b/post/user/client_model.php @@ -4,9 +4,9 @@ $type = sanitizeInput($_POST['type']); $website = preg_replace("(^https?://)", "", sanitizeInput($_POST['website'])); $referral = sanitizeInput($_POST['referral']); $rate = floatval($_POST['rate']); -$currency_code = sanitizeInput($_POST['currency_code']); -$net_terms = intval($_POST['net_terms']); +$currency_code = sanitizeInput($_POST['currency_code'] ?? $session_company_currency); // So we dont have to to have a hidden form input if module sales is disabled +$net_terms = intval($_POST['net_terms'] ?? $config_default_net_terms); $tax_id_number = sanitizeInput($_POST['tax_id_number']); $abbreviation = sanitizeInput($_POST['abbreviation']); $notes = sanitizeInput($_POST['notes']); -$lead = intval($_POST['lead']); +$lead = intval($_POST['lead'] ?? 0); diff --git a/post/user/contact.php b/post/user/contact.php index 0068f449..f8902de8 100644 --- a/post/user/contact.php +++ b/post/user/contact.php @@ -81,7 +81,7 @@ if (isset($_POST['edit_contact'])) { require_once 'post/user/contact_model.php'; $contact_id = intval($_POST['contact_id']); - $send_email = intval($_POST['send_email']); + $send_email = intval($_POST['send_email'] ?? 0); // Get Exisiting Contact Photo and contact_user_id $sql = mysqli_query($mysqli,"SELECT contact_photo, contact_user_id FROM contacts WHERE contact_id = $contact_id"); diff --git a/post/user/credential_model.php b/post/user/credential_model.php index 1ef1f8c1..e0c515bd 100644 --- a/post/user/credential_model.php +++ b/post/user/credential_model.php @@ -9,7 +9,7 @@ $username = encryptLoginEntry(trim($_POST['username'])); $password = encryptLoginEntry(trim($_POST['password'])); $otp_secret = sanitizeInput($_POST['otp_secret']); $note = sanitizeInput($_POST['note']); -$important = intval($_POST['important']); +$important = intval($_POST['important'] ?? 0); $contact_id = intval($_POST['contact']); $vendor_id = intval($_POST['vendor']); $asset_id = intval($_POST['asset']); diff --git a/post/user/trip_model.php b/post/user/trip_model.php index a70f426a..ada58975 100644 --- a/post/user/trip_model.php +++ b/post/user/trip_model.php @@ -3,7 +3,7 @@ $date = sanitizeInput($_POST['date']); $source = sanitizeInput($_POST['source']); $destination = sanitizeInput($_POST['destination']); $miles = floatval($_POST['miles']); -$roundtrip = intval($_POST['roundtrip']); +$roundtrip = intval($_POST['roundtrip'] ?? 0); $purpose = sanitizeInput($_POST['purpose']); $user_id = intval($_POST['user']); $client_id = intval($_POST['client']); diff --git a/trip_add_modal.php b/trip_add_modal.php index d16f91e1..f05d3047 100644 --- a/trip_add_modal.php +++ b/trip_add_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/trip_edit_modal.php b/trip_edit_modal.php index 67c544b8..a30328a1 100644 --- a/trip_edit_modal.php +++ b/trip_edit_modal.php @@ -10,7 +10,6 @@
-