From 2c3ebb3bbb0ebc3c36e5f9ec4d806785f9787970 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sat, 21 Jan 2023 17:09:39 +0000 Subject: [PATCH] Tidy codestyle - spaces between parenthesis and curly braces --- account_add_modal.php | 2 +- accounts.php | 10 +- api_key_add_modal.php | 2 +- calendar_event_add_modal.php | 10 +- calendar_event_edit_modal.php | 22 +- calendar_events.php | 16 +- categories.php | 20 +- check_login.php | 18 +- client_add_modal.php | 16 +- client_asset_add_modal.php | 18 +- client_asset_copy_modal.php | 26 +- client_asset_documents_modal.php | 2 +- client_asset_edit_modal.php | 28 +- client_asset_interface_add_modal.php | 2 +- client_asset_tickets_modal.php | 2 +- client_assets.php | 106 +- client_certificate_add_modal.php | 2 +- client_certificates.php | 22 +- client_contact_add_modal.php | 4 +- client_contact_details.php | 68 +- client_contact_details_modal.php | 8 +- client_contact_edit_modal.php | 16 +- client_contacts.php | 32 +- client_delete_modal.php | 4 +- client_document_add_from_template_modal.php | 6 +- client_document_add_modal.php | 4 +- client_document_details.php | 4 +- client_document_edit_modal.php | 4 +- client_document_template_details.php | 2 +- client_document_templates.php | 12 +- client_documents.php | 28 +- client_domain_add_modal.php | 4 +- client_domains.php | 20 +- client_edit_modal.php | 14 +- client_events.php | 6 +- client_files.php | 18 +- client_invoices.php | 26 +- client_location_add_modal.php | 6 +- client_location_edit_modal.php | 10 +- client_locations.php | 20 +- client_login_add_modal.php | 8 +- client_login_edit_modal.php | 16 +- client_logins.php | 22 +- client_logs.php | 12 +- client_network_add_modal.php | 2 +- client_networks.php | 20 +- client_overview.php | 30 +- client_payments.php | 12 +- client_quotes.php | 24 +- client_recurring_invoices.php | 12 +- client_scheduled_tickets.php | 6 +- client_service_add_modal.php | 14 +- client_service_edit_modal.php | 34 +- client_service_view_modal.php | 70 +- client_services.php | 16 +- client_shared_items.php | 18 +- client_side_nav.php | 94 +- client_software.php | 16 +- client_software_add_modal.php | 4 +- client_software_edit_modal.php | 12 +- client_tickets.php | 30 +- client_trips.php | 16 +- client_vendor_templates.php | 26 +- client_vendors.php | 26 +- clients.php | 92 +- companies.php | 10 +- company_edit_modal.php | 6 +- cron.php | 40 +- dashboard_financial.php | 42 +- database_updates.php | 64 +- expense_add_modal.php | 8 +- expense_copy_modal.php | 12 +- expense_edit_modal.php | 14 +- expenses.php | 54 +- functions.php | 70 +- global_search.php | 32 +- guest_download_file.php | 12 +- guest_header.php | 4 +- guest_pay_invoice.php | 6 +- guest_post.php | 8 +- guest_view_invoice.php | 64 +- guest_view_item.php | 24 +- guest_view_quote.php | 24 +- inc_alert_feedback.php | 6 +- inc_all_client.php | 10 +- inc_client_top_head.php | 26 +- invoice.php | 58 +- invoice_add_modal.php | 6 +- invoice_edit_modal.php | 4 +- invoice_payment_add_modal.php | 10 +- invoices.php | 78 +- item_edit_modal.php | 8 +- login.php | 14 +- logs.php | 54 +- notifications.php | 8 +- notifications_dismissed.php | 28 +- pagination.php | 34 +- pagination_head.php | 8 +- payments.php | 52 +- portal/tickets.php | 2 +- post.php | 1112 +++++++++---------- product_add_modal.php | 4 +- product_edit_modal.php | 8 +- products.php | 10 +- quote.php | 46 +- quote_add_modal.php | 6 +- quote_edit_modal.php | 4 +- quotes.php | 66 +- recurring_invoice.php | 22 +- recurring_invoice_add_modal.php | 6 +- recurring_invoice_edit_modal.php | 14 +- recurring_invoices.php | 54 +- report_expense_by_vendor.php | 12 +- report_expense_summary.php | 12 +- report_income_by_client.php | 12 +- report_income_summary.php | 12 +- report_profit_loss.php | 10 +- report_recurring_by_client.php | 4 +- report_tax_summary.php | 8 +- reports_side_nav.php | 14 +- revenue_add_modal.php | 10 +- revenue_edit_modal.php | 14 +- revenues.php | 52 +- rfc6238.php | 8 +- scheduled_ticket_add_modal.php | 10 +- scheduled_tickets.php | 6 +- settings_alerts.php | 8 +- settings_api.php | 12 +- settings_defaults.php | 30 +- settings_mail.php | 12 +- settings_modules.php | 6 +- settings_online_payment.php | 4 +- settings_side_nav.php | 44 +- settings_tag_edit_modal.php | 2 +- settings_tags.php | 12 +- settings_taxes.php | 8 +- settings_theme.php | 2 +- settings_ticket.php | 2 +- settings_update.php | 10 +- setup.php | 68 +- share_modal.php | 8 +- side_nav.php | 44 +- ticket_edit_modal.php | 18 +- ticket_invoice_add_modal.php | 8 +- ticket_reply_edit_modal.php | 2 +- tickets.php | 30 +- top_nav.php | 8 +- transfer_add_modal.php | 8 +- transfer_edit_modal.php | 8 +- transfers.php | 50 +- trip_add_modal.php | 8 +- trip_copy_modal.php | 12 +- trip_edit_modal.php | 12 +- trips.php | 56 +- user_add_modal.php | 2 +- user_companies_modal.php | 6 +- user_edit_modal.php | 14 +- user_invite_modal.php | 2 +- user_profile.php | 22 +- users.php | 28 +- vendor_add_from_template_modal.php | 4 +- vendor_add_modal.php | 2 +- vendor_template_add_modal.php | 2 +- vendors.php | 30 +- 164 files changed, 2156 insertions(+), 2156 deletions(-) diff --git a/account_add_modal.php b/account_add_modal.php index c79e3b57..d80e26dd 100644 --- a/account_add_modal.php +++ b/account_add_modal.php @@ -39,7 +39,7 @@ diff --git a/accounts.php b/accounts.php index c0018c16..2a0f2019 100644 --- a/accounts.php +++ b/accounts.php @@ -1,6 +1,6 @@
- +
@@ -36,7 +36,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
- "> + "> @@ -47,7 +47,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Edit - +
Archive diff --git a/api_key_add_modal.php b/api_key_add_modal.php index a48976fa..0759c71b 100644 --- a/api_key_add_modal.php +++ b/api_key_add_modal.php @@ -63,7 +63,7 @@ $key = bin2hex(random_bytes(78)); diff --git a/calendar_event_add_modal.php b/calendar_event_add_modal.php index 9e2550d7..47d3d9e3 100644 --- a/calendar_event_add_modal.php +++ b/calendar_event_add_modal.php @@ -49,12 +49,12 @@ - + - + @@ -122,7 +122,7 @@ - +
diff --git a/calendar_event_edit_modal.php b/calendar_event_edit_modal.php index 92acfe50..c387e5ea 100644 --- a/calendar_event_edit_modal.php +++ b/calendar_event_edit_modal.php @@ -51,12 +51,12 @@ - +
@@ -104,7 +104,7 @@
- + @@ -121,12 +121,12 @@ - + - +
diff --git a/calendar_events.php b/calendar_events.php index 5d8fb791..64d52050 100644 --- a/calendar_events.php +++ b/calendar_events.php @@ -4,7 +4,7 @@
- +
@@ -61,10 +61,10 @@ $colors_diff = array_diff($colors_array,$colors_used_array);
- Expense - Income - Referral - Payment Method + Expense + Income + Referral + Payment Method
@@ -72,7 +72,7 @@ $colors_diff = array_diff($colors_array,$colors_used_array);
Name Currency
- "> + "> @@ -82,7 +82,7 @@ $colors_diff = array_diff($colors_array,$colors_used_array); @@ -155,7 +155,7 @@ @@ -227,7 +227,7 @@
- +
@@ -237,7 +237,7 @@
@@ -251,7 +251,7 @@
@@ -277,7 +277,7 @@ // Checks/prompts that the primary contact field (required) is populated - function promptPrimaryContact(){ + function promptPrimaryContact() { let primaryContactField = document.getElementById("primaryContact").value; - if (primaryContactField == null || primaryContactField === ""){ + if (primaryContactField == null || primaryContactField === "") { document.getElementById("contactNavPill").click(); } } diff --git a/client_asset_add_modal.php b/client_asset_add_modal.php index 51cb2119..d7f35508 100644 --- a/client_asset_add_modal.php +++ b/client_asset_add_modal.php @@ -2,7 +2,7 @@
-
New
+
New
@@ -64,7 +64,7 @@
+ if ($_GET['type'] !== 'virtual') { ?>
@@ -96,7 +96,7 @@
- +
@@ -123,7 +123,7 @@ @@ -136,7 +136,7 @@
- +
@@ -148,7 +148,7 @@ @@ -188,7 +188,7 @@ @@ -261,7 +261,7 @@
- +
diff --git a/client_asset_copy_modal.php b/client_asset_copy_modal.php index d7da3597..76f4e491 100644 --- a/client_asset_copy_modal.php +++ b/client_asset_copy_modal.php @@ -55,14 +55,14 @@
+ if ($asset_type !== 'virtual') { ?>
@@ -94,7 +94,7 @@
- +
@@ -121,11 +121,11 @@ - +
- +
@@ -146,7 +146,7 @@ @@ -168,7 +168,7 @@
@@ -185,13 +185,13 @@ '$asset_created_at' OR network_archived_at IS NULL) AND network_client_id = $client_id ORDER BY network_name ASC"); - while($row = mysqli_fetch_array($sql_networks)){ + while ($row = mysqli_fetch_array($sql_networks)) { $network_id_select = $row['network_id']; $network_name_select = htmlentities($row['network_name']); $network_select = htmlentities($row['network']); ?> - + '$asset_created_at' OR vendor_archived_at IS NULL) AND vendor_client_id = $client_id AND vendor_template = 0 ORDER BY vendor_name ASC"); - while($row = mysqli_fetch_array($sql_vendors)){ + while ($row = mysqli_fetch_array($sql_vendors)) { $vendor_id_select = $row['vendor_id']; $vendor_name_select = htmlentities($row['vendor_name']); ?> - +
- +
diff --git a/client_asset_documents_modal.php b/client_asset_documents_modal.php index 6cafbc87..17c0f672 100644 --- a/client_asset_documents_modal.php +++ b/client_asset_documents_modal.php @@ -10,7 +10,7 @@
diff --git a/client_asset_edit_modal.php b/client_asset_edit_modal.php index b8b592c0..2c5e8bf2 100644 --- a/client_asset_edit_modal.php +++ b/client_asset_edit_modal.php @@ -56,14 +56,14 @@
+ if ($asset_type !== 'virtual') { ?>
@@ -95,7 +95,7 @@
- +
@@ -122,11 +122,11 @@ - + '$asset_created_at' OR contact_archived_at IS NULL) AND contact_client_id = $client_id ORDER BY contact_name ASC"); - while($row = mysqli_fetch_array($sql_contacts)){ + while ($row = mysqli_fetch_array($sql_contacts)) { $contact_id_select = $row['contact_id']; $contact_name_select = htmlentities($row['contact_name']); ?> -
@@ -186,13 +186,13 @@ '$asset_created_at' OR network_archived_at IS NULL) AND network_client_id = $client_id ORDER BY network_name ASC"); - while($row = mysqli_fetch_array($sql_networks)){ + while ($row = mysqli_fetch_array($sql_networks)) { $network_id_select = $row['network_id']; $network_name_select = htmlentities($row['network_name']); $network_select = htmlentities($row['network']); ?> - + '$asset_created_at' OR vendor_archived_at IS NULL) AND vendor_client_id = $client_id ORDER BY vendor_name ASC"); - while($row = mysqli_fetch_array($sql_vendors)){ + while ($row = mysqli_fetch_array($sql_vendors)) { $vendor_id_select = $row['vendor_id']; $vendor_name_select = htmlentities($row['vendor_name']); ?> - +
- +
diff --git a/client_asset_interface_add_modal.php b/client_asset_interface_add_modal.php index 54d0430b..eadbfbc6 100644 --- a/client_asset_interface_add_modal.php +++ b/client_asset_interface_add_modal.php @@ -76,7 +76,7 @@

Assets

- +
@@ -86,7 +86,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
- s"> + s">
@@ -94,30 +94,30 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
- All Assets + All Assets 0){ ?> - Workstations + if ($workstation_count > 0) { ?> + Workstations 0){ ?> - Servers + if ($server_count > 0) { ?> + Servers 0){ ?> - Virtual + if ($virtual_count > 0) { ?> + Virtual 0){ ?> - Network + if ($network_count > 0) { ?> + Network 0){ ?> - Other + if ($network_count > 0) { ?> + Other
@@ -135,23 +135,23 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Name Color
- "> + "> - + - + - + - + - + @@ -162,26 +162,26 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); "; @@ -191,7 +191,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $asset_purchase_date = $row['asset_purchase_date']; $asset_warranty_expire = $row['asset_warranty_expire']; $asset_install_date = $row['asset_install_date']; - if(empty($asset_install_date)){ + if (empty($asset_install_date)) { $asset_install_date_display = "-"; }else{ $asset_install_date_display = $asset_install_date; @@ -203,41 +203,41 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $asset_contact_id = $row['asset_contact_id']; $asset_network_id = $row['asset_network_id']; - if($asset_type == 'Laptop'){ + if ($asset_type == 'Laptop') { $device_icon = "laptop"; - }elseif($asset_type == 'Desktop'){ + }elseif ($asset_type == 'Desktop') { $device_icon = "desktop"; - }elseif($asset_type == 'Server'){ + }elseif ($asset_type == 'Server') { $device_icon = "server"; - }elseif($asset_type == 'Printer'){ + }elseif ($asset_type == 'Printer') { $device_icon = "print"; - }elseif($asset_type == 'Camera'){ + }elseif ($asset_type == 'Camera') { $device_icon = "video"; - }elseif($asset_type == 'Switch' || $asset_type == 'Firewall/Router'){ + }elseif ($asset_type == 'Switch' || $asset_type == 'Firewall/Router') { $device_icon = "network-wired"; - }elseif($asset_type == 'Access Point'){ + }elseif ($asset_type == 'Access Point') { $device_icon = "wifi"; - }elseif($asset_type == 'Phone'){ + }elseif ($asset_type == 'Phone') { $device_icon = "phone"; - }elseif($asset_type == 'Mobile Phone'){ + }elseif ($asset_type == 'Mobile Phone') { $device_icon = "mobile-alt"; - }elseif($asset_type == 'Tablet'){ + }elseif ($asset_type == 'Tablet') { $device_icon = "tablet-alt"; - }elseif($asset_type == 'TV'){ + }elseif ($asset_type == 'TV') { $device_icon = "tv"; - }elseif($asset_type == 'Virtual Machine'){ + }elseif ($asset_type == 'Virtual Machine') { $device_icon = "cloud"; }else{ $device_icon = "tag"; } $contact_name = $row['contact_name']; - if(empty($contact_name)){ + if (empty($contact_name)) { $contact_name = "-"; } $location_name = $row['location_name']; - if(empty($location_name)){ + if (empty($location_name)) { $location_name = "-"; } @@ -264,7 +264,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); 0){ + if ($login_id > 0) { ?> @@ -304,20 +304,20 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); ?> - + - + - + - + - + @@ -329,13 +329,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); InterfacesEditCopy - 0){ ?> + 0) { ?> Documents () - 0){ ?> + 0) { ?> Tickets () - +
ArchiveDelete diff --git a/client_certificate_add_modal.php b/client_certificate_add_modal.php index 92478a5e..19a9e8d3 100644 --- a/client_certificate_add_modal.php +++ b/client_certificate_add_modal.php @@ -74,7 +74,7 @@ $domain_name"; diff --git a/client_certificates.php b/client_certificates.php index 72192bf2..1932bcc1 100644 --- a/client_certificates.php +++ b/client_certificates.php @@ -2,7 +2,7 @@
- +
@@ -51,7 +51,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Name Type Make/Model Serial Number Operating System Install Date Assigned To Location
- "> + "> @@ -63,7 +63,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
)" data-target="#editCertificateModal">Edit - +
Delete @@ -115,7 +115,7 @@ include("client_certificate_add_modal.php"); jQuery.get( "ajax.php", {certificate_get_json_details: 'true', client_id: client_id, certificate_id: certificate_id}, - function(data){ + function(data) { // If we get a response from post.php, parse it as JSON const response = JSON.parse(data); @@ -145,7 +145,7 @@ include("client_certificate_add_modal.php"); // Populate domain dropdown domains.forEach(domain => { - if(parseInt(domain.domain_id) == parseInt(certificate.certificate_domain_id)){ + if (parseInt(domain.domain_id) == parseInt(certificate.certificate_domain_id)) { // Selected domain domainDropdown[domainDropdown.length] = new Option(domain.domain_name, domain.domain_id, true, true); } @@ -162,14 +162,14 @@ include("client_certificate_add_modal.php"); function fetchSSL(type) { // Get the domain name input & issued/expire/key fields, based on whether this is a new cert or updating an existing - if(type == 'new'){ + if (type == 'new') { var domain = document.getElementById("domain").value; var issuedBy = document.getElementById("issuedBy"); var expire = document.getElementById("expire"); var publicKey = document.getElementById("publicKey"); } - if(type == 'edit'){ + if (type == 'edit') { var domain = document.getElementById("editDomain").value; var issuedBy = document.getElementById("editIssuedBy"); var expire = document.getElementById("editExpire"); @@ -180,11 +180,11 @@ include("client_certificate_add_modal.php"); jQuery.get( "ajax.php", {certificate_fetch_parse_json_details: 'TRUE', domain: domain}, - function(data){ + function(data) { //If we get a response from post.php, parse it as JSON const ssl_data = JSON.parse(data); - if(ssl_data.success == "TRUE"){ + if (ssl_data.success == "TRUE") { // Fill the form fields with the cert data issuedBy.value = ssl_data.issued_by; expire.value = ssl_data.expire; diff --git a/client_contact_add_modal.php b/client_contact_add_modal.php index a2b28e99..f87bedc5 100644 --- a/client_contact_add_modal.php +++ b/client_contact_add_modal.php @@ -41,7 +41,7 @@
- > + >
@@ -120,7 +120,7 @@ diff --git a/client_contact_details.php b/client_contact_details.php index 98fa49c0..017e1fc4 100644 --- a/client_contact_details.php +++ b/client_contact_details.php @@ -2,7 +2,7 @@ Primary Contact"; }else{ $primary_contact_display = FALSE; } $contact_location_id = $row['contact_location_id']; $location_name = htmlentities($row['location_name']); - if(empty($location_name)){ + if (empty($location_name)) { $location_name_display = "-"; }else{ $location_name_display = $location_name; @@ -65,7 +65,7 @@ if(isset($_GET['contact_id'])){
- + contact_photo"> @@ -76,19 +76,19 @@ if(isset($_GET['contact_id'])){

- +
- +
- +
- +
- +
@@ -122,7 +122,7 @@ if(isset($_GET['contact_id'])){ -
"> +
">

Assets

@@ -144,26 +144,26 @@ if(isset($_GET['contact_id'])){
"; @@ -173,7 +173,7 @@ if(isset($_GET['contact_id'])){ $asset_purchase_date = $row['asset_purchase_date']; $asset_warranty_expire = $row['asset_warranty_expire']; $asset_install_date = $row['asset_install_date']; - if(empty($asset_install_date)){ + if (empty($asset_install_date)) { $asset_install_date_display = "-"; }else{ $asset_install_date_display = $asset_install_date; @@ -184,29 +184,29 @@ if(isset($_GET['contact_id'])){ $asset_location_id = $row['asset_location_id']; $asset_network_id = $row['asset_network_id']; - if($asset_type == 'Laptop'){ + if ($asset_type == 'Laptop') { $device_icon = "laptop"; - }elseif($asset_type == 'Desktop'){ + }elseif ($asset_type == 'Desktop') { $device_icon = "desktop"; - }elseif($asset_type == 'Server'){ + }elseif ($asset_type == 'Server') { $device_icon = "server"; - }elseif($asset_type == 'Printer'){ + }elseif ($asset_type == 'Printer') { $device_icon = "print"; - }elseif($asset_type == 'Camera'){ + }elseif ($asset_type == 'Camera') { $device_icon = "video"; - }elseif($asset_type == 'Switch' || $asset_type == 'Firewall/Router'){ + }elseif ($asset_type == 'Switch' || $asset_type == 'Firewall/Router') { $device_icon = "network-wired"; - }elseif($asset_type == 'Access Point'){ + }elseif ($asset_type == 'Access Point') { $device_icon = "wifi"; - }elseif($asset_type == 'Phone'){ + }elseif ($asset_type == 'Phone') { $device_icon = "phone"; - }elseif($asset_type == 'Mobile Phone'){ + }elseif ($asset_type == 'Mobile Phone') { $device_icon = "mobile-alt"; - }elseif($asset_type == 'Tablet'){ + }elseif ($asset_type == 'Tablet') { $device_icon = "tablet-alt"; - }elseif($asset_type == 'TV'){ + }elseif ($asset_type == 'TV') { $device_icon = "tv"; - }elseif($asset_type == 'Virtual Machine'){ + }elseif ($asset_type == 'Virtual Machine') { $device_icon = "cloud"; }else{ $device_icon = "tag"; @@ -230,7 +230,7 @@ if(isset($_GET['contact_id'])){ InterfacesEditCopy - +
ArchiveDelete @@ -260,7 +260,7 @@ if(isset($_GET['contact_id'])){ -
"> +
">

Passwords

@@ -280,17 +280,17 @@ if(isset($_GET['contact_id'])){
"; } $login_username = htmlentities($row['login_username']); - if(empty($login_username)){ + if (empty($login_username)) { $login_username_display = "-"; }else{ $login_username_display = "$login_username"; @@ -298,7 +298,7 @@ if(isset($_GET['contact_id'])){ $login_password = htmlentities(decryptLoginEntry($row['login_password'])); $login_otp_secret = htmlentities($row['login_otp_secret']); $login_id_with_secret = '"' . $row['login_id'] . '","' . $row['login_otp_secret'] . '"'; - if(empty($login_otp_secret)){ + if (empty($login_otp_secret)) { $otp_display = "-"; }else{ $otp_display = " Hover.."; @@ -331,7 +331,7 @@ if(isset($_GET['contact_id'])){
Edit )">Share - +
Delete diff --git a/client_contact_details_modal.php b/client_contact_details_modal.php index 749ac31b..48a3c649 100644 --- a/client_contact_details_modal.php +++ b/client_contact_details_modal.php @@ -33,7 +33,7 @@ " required>
- > + >
@@ -58,7 +58,7 @@
- > + >
@@ -122,11 +122,11 @@ '$contact_created_at' OR location_archived_at IS NULL) AND location_client_id = $client_id ORDER BY location_name ASC"); - while($row = mysqli_fetch_array($sql_locations)){ + while ($row = mysqli_fetch_array($sql_locations)) { $location_id_select = $row['location_id']; $location_name_select = htmlentities($row['location_name']); ?> - + - +
@@ -180,7 +180,7 @@
- + contact_photo"> diff --git a/client_contacts.php b/client_contacts.php index 38aee406..68373c15 100644 --- a/client_contacts.php +++ b/client_contacts.php @@ -2,11 +2,11 @@
- +
@@ -75,7 +75,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Name Domain
- "> + "> @@ -89,36 +89,36 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $contact_title"; } $contact_department =htmlentities($row['contact_department']); - if(empty($contact_department)){ + if (empty($contact_department)) { $contact_department_display = "-"; }else{ $contact_department_display = $contact_department; } $contact_phone = formatPhoneNumber($row['contact_phone']); - if(empty($contact_phone)){ + if (empty($contact_phone)) { $contact_phone_display = "-"; }else{ $contact_phone_display = "$contact_phone"; } $contact_extension = htmlentities($row['contact_extension']); $contact_mobile = formatPhoneNumber($row['contact_mobile']); - if(empty($contact_mobile)){ + if (empty($contact_mobile)) { $contact_mobile_display = "-"; }else{ $contact_mobile_display = "$contact_mobile"; } $contact_email = htmlentities($row['contact_email']); - if(empty($contact_email)){ + if (empty($contact_email)) { $contact_email_display = "-"; }else{ $contact_email_display = "$contact_email"; @@ -128,14 +128,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $contact_notes = htmlentities($row['contact_notes']); $contact_important = intval($row['contact_important']); $contact_created_at = $row['contact_created_at']; - if($contact_id == $primary_contact){ + if ($contact_id == $primary_contact) { $primary_contact_display = "Primary Contact"; }else{ $primary_contact_display = FALSE; } $contact_location_id = $row['contact_location_id']; $location_name = htmlentities($row['location_name']); - if(empty($location_name)){ + if (empty($location_name)) { $location_name_display = "-"; }else{ $location_name_display = $location_name; @@ -162,7 +162,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); - +
Name Department
- + "> @@ -183,7 +183,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); @@ -194,7 +194,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
View Details Edit - +
Archive
diff --git a/client_delete_modal.php b/client_delete_modal.php index 370c82d7..12ed3740 100644 --- a/client_delete_modal.php +++ b/client_delete_modal.php @@ -1,6 +1,6 @@ diff --git a/client_logs.php b/client_logs.php index 190b1619..7557808c 100644 --- a/client_logs.php +++ b/client_logs.php @@ -2,14 +2,14 @@
- +
@@ -55,7 +55,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
- "> + "> @@ -69,7 +69,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); diff --git a/client_networks.php b/client_networks.php index 4500dbf8..953cf6ae 100644 --- a/client_networks.php +++ b/client_networks.php @@ -2,7 +2,7 @@
- +
@@ -53,7 +53,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Timestamp User
- "> + "> @@ -67,11 +67,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
)" data-target="#editNetworkModal">Edit - +
Delete @@ -145,7 +145,7 @@ function populateNetworkEditModal(client_id, network_id) { jQuery.get( "ajax.php", {network_get_json_details: 'true', client_id: client_id, network_id: network_id}, - function(data){ + function(data) { // If we get a response from post.php, parse it as JSON const response = JSON.parse(data); @@ -175,7 +175,7 @@ function populateNetworkEditModal(client_id, network_id) { // Populate location dropdown locations.forEach(location => { - if(parseInt(location.location_id) == parseInt(network.network_location_id)){ + if (parseInt(location.location_id) == parseInt(network.network_location_id)) { locationDropdown[locationDropdown.length] = new Option(location.location_name, location.location_id, true, true); } else{ diff --git a/client_overview.php b/client_overview.php index 22f2f65a..422a34be 100644 --- a/client_overview.php +++ b/client_overview.php @@ -44,7 +44,7 @@ $sql_domains_expiring = mysqli_query($mysqli,"SELECT * FROM domains
- 0 ){ ?> + 0 ) { ?>
@@ -57,7 +57,7 @@ $sql_domains_expiring = mysqli_query($mysqli,"SELECT * FROM domains
Name vLAN
- +
@@ -57,7 +57,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
- + $contact_phone $contact_extension"; ?> - +
@@ -94,7 +94,7 @@ $sql_domains_expiring = mysqli_query($mysqli,"SELECT * FROM domains - 0 || mysqli_num_rows($sql_vendors) > 0 ){ ?> + 0 || mysqli_num_rows($sql_vendors) > 0 ) { ?>
@@ -105,7 +105,7 @@ $sql_domains_expiring = mysqli_query($mysqli,"SELECT * FROM domains - 0 || mysqli_num_rows($sql_vendors) > 0 ){ ?> + 0 || mysqli_num_rows($sql_vendors) > 0 ) { ?>
@@ -152,7 +152,7 @@ $sql_domains_expiring = mysqli_query($mysqli,"SELECT * FROM domains
- 0){ ?> + 0) { ?> @@ -267,7 +267,7 @@ $sql_domains_expiring = mysqli_query($mysqli,"SELECT * FROM domains
- "> + "> @@ -72,7 +72,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
- +
@@ -59,7 +59,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Payment Date Invoice Date
- "> + "> @@ -73,12 +73,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); ">EditCopy
- + Send
diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php index 41932b22..a449242e 100644 --- a/client_recurring_invoices.php +++ b/client_recurring_invoices.php @@ -2,7 +2,7 @@
- +
@@ -53,7 +53,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Number Scope
- "> + "> @@ -69,7 +69,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
- +
@@ -93,7 +93,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); )">Edit
$contact_name"; @@ -114,7 +114,7 @@ $document_name"; @@ -152,7 +152,7 @@ $login_name"; @@ -189,7 +189,7 @@
@@ -107,11 +107,11 @@ // NOTE: These are called $sql_all and $row_all for a reason - anything overwriting $sql or $row will break the current while loop we are in from client_services.php $sql_all = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = '$client_id'"); - while($row_all = mysqli_fetch_array($sql_all)){ + while ($row_all = mysqli_fetch_array($sql_all)) { $contact_id = $row_all['contact_id']; $contact_name = htmlentities($row_all['contact_name']); - if(in_array($contact_id, $selected_ids)){ + if (in_array($contact_id, $selected_ids)) { echo ""; } else{ @@ -129,11 +129,11 @@ $selected_ids = array_column(mysqli_fetch_all($sql_vendors,MYSQLI_ASSOC), "vendor_id"); $sql_all = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_template = 0 AND vendor_client_id = '$client_id'"); - while($row_all = mysqli_fetch_array($sql_all)){ + while ($row_all = mysqli_fetch_array($sql_all)) { $vendor_id = $row_all['vendor_id']; $vendor_name = htmlentities($row_all['vendor_name']); - if(in_array($vendor_id, $selected_ids)){ + if (in_array($vendor_id, $selected_ids)) { echo ""; } else{ @@ -151,11 +151,11 @@ $selected_ids = array_column(mysqli_fetch_all($sql_docs,MYSQLI_ASSOC), "document_id"); $sql_all = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_client_id = '$client_id'"); - while($row_all = mysqli_fetch_array($sql_all)){ + while ($row_all = mysqli_fetch_array($sql_all)) { $document_id = $row_all['document_id']; $document_name = htmlentities($row_all['document_name']); - if(in_array($document_id, $selected_ids)){ + if (in_array($document_id, $selected_ids)) { echo ""; } else{ @@ -184,11 +184,11 @@ $selected_ids = array_column(mysqli_fetch_all($sql_assets,MYSQLI_ASSOC), "asset_id"); $sql_all = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = '$client_id'"); - while($row_all = mysqli_fetch_array($sql_all)){ + while ($row_all = mysqli_fetch_array($sql_all)) { $asset_id = $row_all['asset_id']; $asset_name = htmlentities($row_all['asset_name']); - if(in_array($asset_id, $selected_ids)){ + if (in_array($asset_id, $selected_ids)) { echo ""; } else{ @@ -208,11 +208,11 @@ $selected_ids = array_column(mysqli_fetch_all($sql_logins,MYSQLI_ASSOC), "login_id"); $sql_all = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_client_id = '$client_id'"); - while($row_all = mysqli_fetch_array($sql_all)){ + while ($row_all = mysqli_fetch_array($sql_all)) { $login_id = $row_all['login_id']; $login_name = htmlentities($row_all['login_name']); - if(in_array($login_id, $selected_ids)){ + if (in_array($login_id, $selected_ids)) { echo ""; } else{ @@ -237,11 +237,11 @@ $selected_ids = array_column(mysqli_fetch_all($sql_domains,MYSQLI_ASSOC), "domain_id"); $sql_all = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_client_id = '$client_id'"); - while($row_all = mysqli_fetch_array($sql_all)){ + while ($row_all = mysqli_fetch_array($sql_all)) { $domain_id = $row_all['domain_id']; $domain_name = htmlentities($row_all['domain_name']); - if(in_array($domain_id, $selected_ids)){ + if (in_array($domain_id, $selected_ids)) { echo ""; } else{ @@ -261,11 +261,11 @@ $selected_ids = array_column(mysqli_fetch_all($sql_certificates,MYSQLI_ASSOC), "certificate_id"); $sql_all = mysqli_query($mysqli, "SELECT * FROM certificates WHERE certificate_client_id = '$client_id'"); - while($row_all = mysqli_fetch_array($sql_all)){ + while ($row_all = mysqli_fetch_array($sql_all)) { $cert_id = $row_all['certificate_id']; $cert_name = htmlentities($row_all['certificate_name']); - if(in_array($cert_id, $selected_ids)){ + if (in_array($cert_id, $selected_ids)) { echo ""; } else{ diff --git a/client_service_view_modal.php b/client_service_view_modal.php index aadc7b1a..3136e04e 100644 --- a/client_service_view_modal.php +++ b/client_service_view_modal.php @@ -23,15 +23,15 @@ 0){ ?> + if (mysqli_num_rows($sql_assets) > 0) { ?>
Assets
    + if (!empty($networks)) { ?>
    Networks
      $network[0] (VLAN $network[1])"; } @@ -84,7 +84,7 @@ + if (!empty($location_names)) { ?>
      Locations
        $location"; } ?> @@ -118,7 +118,7 @@ 0){ ?> + if (mysqli_num_rows($sql_domains) > 0) { ?>
        Domains
          $row[domain_name]"; } } @@ -139,7 +139,7 @@ 0){ ?> + if (mysqli_num_rows($sql_certificates) > 0) { ?>
          Certificates
            $row[certificate_name] ($row[certificate_domain])"; } } @@ -173,11 +173,11 @@ // Reset the $sql_vendors pointer to the start mysqli_data_seek($sql_vendors, 0); - if(mysqli_num_rows($sql_vendors) > 0){ ?> + if (mysqli_num_rows($sql_vendors) > 0) { ?>
            Vendors
              $row[vendor_name]"; } ?> @@ -188,14 +188,14 @@ 0){ ?> + if (mysqli_num_rows($sql_contacts) > 0) { ?>
              Contacts
                $row[contact_name]"; } ?> @@ -206,7 +206,7 @@ 0 || mysqli_num_rows($sql_logins) > 0){ ?> + if (mysqli_num_rows($sql_assets) > 0 || mysqli_num_rows($sql_logins) > 0) { ?>
                Logins
                  $row[login_name]"; } } // Showing explicitly linked logins - while($row = mysqli_fetch_array($sql_logins)){ - if(!empty($row['login_name'])){ + while ($row = mysqli_fetch_array($sql_logins)) { + if (!empty($row['login_name'])) { echo "
                • $row[login_name]
                  • "; } } @@ -235,7 +235,7 @@ + if ($sql_logins || $sql_assets) { ?>
                  URLs
                    $row[login_uri]"; } } @@ -253,8 +253,8 @@ mysqli_data_seek($sql_assets, 0); // Show URLs linked to assets, that also have logins - while($row = mysqli_fetch_array($sql_assets)){ - if(!empty($row['login_uri'])){ + while ($row = mysqli_fetch_array($sql_assets)) { + if (!empty($row['login_uri'])) { echo "
                  • $row[login_uri]
                    • "; } } @@ -266,14 +266,14 @@ 0){ ?> + if (mysqli_num_rows($sql_docs) > 0) { ?>
                    Documents
                      $row[document_name]"; } ?> diff --git a/client_services.php b/client_services.php index 679d6dde..efb5325b 100644 --- a/client_services.php +++ b/client_services.php @@ -2,7 +2,7 @@
                      - +
                      @@ -44,7 +44,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Number Scope
- "> + "> @@ -57,7 +57,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $service_importance"; - }elseif($service_importance == "Medium"){ + }elseif ($service_importance == "Medium") { $service_importance_display = "$service_importance"; - }elseif($service_importance == "Low"){ + }elseif ($service_importance == "Low") { $service_importance_display = "$service_importance"; }else{ $service_importance_display = "-"; @@ -96,7 +96,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Edit - +
Delete diff --git a/client_shared_items.php b/client_shared_items.php index 74e37eab..9ad310b9 100644 --- a/client_shared_items.php +++ b/client_shared_items.php @@ -2,11 +2,11 @@
- +
@@ -54,7 +54,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Name Category
- "> + "> @@ -67,7 +67,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Item Name Item Type
- +
@@ -53,7 +53,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
- "> + "> @@ -66,7 +66,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Software Type
0){ + if ($login_id > 0) { ?> @@ -160,7 +160,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Edit - +
Delete diff --git a/client_software_add_modal.php b/client_software_add_modal.php index 393bdfac..22ae765f 100644 --- a/client_software_add_modal.php +++ b/client_software_add_modal.php @@ -138,7 +138,7 @@
@@ -79,7 +79,7 @@ @@ -138,7 +138,7 @@
  • - > + >
    • @@ -171,7 +171,7 @@
  • - > + >
    • diff --git a/client_tickets.php b/client_tickets.php index 1b6cc6ee..b11b85cc 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -2,14 +2,14 @@
    - +
    @@ -73,7 +73,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    - "> + "> @@ -90,7 +90,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); Never

    "; } else{ @@ -112,26 +112,26 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); } $ticket_closed_at = $row['ticket_closed_at']; - if($ticket_status == "Open"){ + if ($ticket_status == "Open") { $ticket_status_display = "$ticket_status"; - }elseif($ticket_status == "Working"){ + }elseif ($ticket_status == "Working") { $ticket_status_display = "$ticket_status"; }else{ $ticket_status_display = "$ticket_status"; } - if($ticket_priority == "High"){ + if ($ticket_priority == "High") { $ticket_priority_display = "$ticket_priority"; - }elseif($ticket_priority == "Medium"){ + }elseif ($ticket_priority == "Medium") { $ticket_priority_display = "$ticket_priority"; - }elseif($ticket_priority == "Low"){ + }elseif ($ticket_priority == "Low") { $ticket_priority_display = "$ticket_priority"; }else{ $ticket_priority_display = "-"; } $ticket_assigned_to = $row['ticket_assigned_to']; if (empty($ticket_assigned_to)) { - if($ticket_status == "Closed"){ + if ($ticket_status == "Closed") { $ticket_assigned_to_display = "

    Not Assigned

    "; } else{ @@ -142,7 +142,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); } $contact_id = $row['contact_id']; $contact_name = htmlentities($row['contact_name']); - if(empty($contact_name)){ + if (empty($contact_name)) { $contact_display = "-"; }else{ $contact_display = "$contact_name
    $contact_email"; @@ -165,14 +165,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    Number Subject
    - +
    Edit - +
    Delete diff --git a/client_trips.php b/client_trips.php index deaf15f3..16845c0d 100644 --- a/client_trips.php +++ b/client_trips.php @@ -2,20 +2,20 @@
    - +
    @@ -71,7 +71,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    - "> + "> @@ -85,7 +85,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); "; }else{ $round_trip_display = ""; } $user_name = htmlentities($row['user_name']); - if(empty($user_name)){ + if (empty($user_name)) { $user_name_display = "-"; }else{ $user_name_display = $user_name; diff --git a/client_vendor_templates.php b/client_vendor_templates.php index c3ba6452..f8467b5b 100644 --- a/client_vendor_templates.php +++ b/client_vendor_templates.php @@ -2,11 +2,11 @@
    - +
    @@ -65,7 +65,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    Date Driver
    - "> + "> @@ -76,18 +76,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    @@ -118,7 +118,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    Vendor Description

    @@ -128,7 +128,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); } ?>
    @@ -136,7 +136,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); } ?>
    @@ -151,7 +151,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    Edit - +
    Delete diff --git a/client_vendors.php b/client_vendors.php index 3d5461bf..8ca53126 100644 --- a/client_vendors.php +++ b/client_vendors.php @@ -2,11 +2,11 @@
    - +
    @@ -79,7 +79,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    - "> + "> @@ -90,18 +90,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    @@ -133,7 +133,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    Vendor Description

    @@ -143,7 +143,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); } ?>
    @@ -151,7 +151,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); } ?>
    @@ -166,7 +166,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    Edit - +
    Delete diff --git a/clients.php b/clients.php index 74345302..85679ca3 100644 --- a/clients.php +++ b/clients.php @@ -3,7 +3,7 @@ include("inc_all.php"); //Paging -if(isset($_GET['p'])){ +if (isset($_GET['p'])) { $p = intval($_GET['p']); $record_from = (($p)-1)*$_SESSION['records_per_page']; $record_to = $_SESSION['records_per_page']; @@ -14,11 +14,11 @@ if(isset($_GET['p'])){ } //Custom Query Filter -if(isset($_GET['query'])){ +if (isset($_GET['query'])) { $query = strip_tags(mysqli_real_escape_string($mysqli,$_GET['query'])); //Phone Numbers $phone_query = preg_replace("/[^0-9]/", '',$query); - if(empty($phone_query)){ + if (empty($phone_query)) { $phone_query = $query; } }else{ @@ -27,15 +27,15 @@ if(isset($_GET['query'])){ } //Column Filter -if(!empty($_GET['sortby'])){ +if (!empty($_GET['sortby'])) { $sortby = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sortby'])); }else{ $sortby = "client_accessed_at"; } //Column Order Filter -if(isset($_GET['order'])){ - if($_GET['order'] == 'ASC'){ +if (isset($_GET['order'])) { + if ($_GET['order'] == 'ASC') { $order = "ASC"; $order_display = "DESC"; }else{ @@ -47,38 +47,38 @@ if(isset($_GET['order'])){ $order_display = "ASC"; } -if(empty($_GET['canned_date'])) { +if (empty($_GET['canned_date'])) { //Prevents lots of undefined variable errors. // $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00 $_GET['canned_date'] = 'custom'; } //Date Filter -if($_GET['canned_date'] == "custom" && !empty($_GET['date_from'])){ +if ($_GET['canned_date'] == "custom" && !empty($_GET['date_from'])) { $date_from = strip_tags(mysqli_real_escape_string($mysqli,$_GET['date_from'])); $date_to = strip_tags(mysqli_real_escape_string($mysqli,$_GET['date_to'])); -}elseif($_GET['canned_date'] == "today"){ +}elseif ($_GET['canned_date'] == "today") { $date_from = date('Y-m-d'); $date_to = date('Y-m-d'); -}elseif($_GET['canned_date'] == "yesterday"){ +}elseif ($_GET['canned_date'] == "yesterday") { $date_from = date('Y-m-d',strtotime("yesterday")); $date_to = date('Y-m-d',strtotime("yesterday")); -}elseif($_GET['canned_date'] == "thisweek"){ +}elseif ($_GET['canned_date'] == "thisweek") { $date_from = date('Y-m-d',strtotime("monday this week")); $date_to = date('Y-m-d'); -}elseif($_GET['canned_date'] == "lastweek"){ +}elseif ($_GET['canned_date'] == "lastweek") { $date_from = date('Y-m-d',strtotime("monday last week")); $date_to = date('Y-m-d',strtotime("sunday last week")); -}elseif($_GET['canned_date'] == "thismonth"){ +}elseif ($_GET['canned_date'] == "thismonth") { $date_from = date('Y-m-01'); $date_to = date('Y-m-d'); -}elseif($_GET['canned_date'] == "lastmonth"){ +}elseif ($_GET['canned_date'] == "lastmonth") { $date_from = date('Y-m-d',strtotime("first day of last month")); $date_to = date('Y-m-d',strtotime("last day of last month")); -}elseif($_GET['canned_date'] == "thisyear"){ +}elseif ($_GET['canned_date'] == "thisyear") { $date_from = date('Y-01-01'); $date_to = date('Y-m-d'); -}elseif($_GET['canned_date'] == "lastyear"){ +}elseif ($_GET['canned_date'] == "lastyear") { $date_from = date('Y-m-d',strtotime("first day of january last year")); $date_to = date('Y-m-d',strtotime("last day of december last year")); }else{ @@ -108,7 +108,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));

    Clients

    - +
    @@ -119,7 +119,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    - +
    @@ -127,21 +127,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    -
    " id="advancedFilter"> +
    " id="advancedFilter">
    @@ -163,19 +163,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    - "> + "> - - + + $location_city $location_state $location_zip"; @@ -211,18 +211,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $client_tag_name_display_array = array(); $client_tag_id_array = array(); $sql_client_tags = mysqli_query($mysqli,"SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_tags.client_id = $client_id"); - while($row = mysqli_fetch_array($sql_client_tags)){ + while ($row = mysqli_fetch_array($sql_client_tags)) { $client_tag_id = $row['tag_id']; $client_tag_name = htmlentities($row['tag_name']); $client_tag_color = htmlentities($row['tag_color']); $client_tag_icon = htmlentities($row['tag_icon']); - if(empty($client_tag_icon)){ + if (empty($client_tag_icon)) { $client_tag_icon = "tag"; } $client_tag_id_array[] = $client_tag_id; - if(empty($client_tag_color)){ + if (empty($client_tag_color)) { $client_tag_name_display_array[] = "$client_tag_name "; }else{ $client_tag_name_display_array[] = " $client_tag_name "; @@ -243,7 +243,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $balance = $invoice_amounts - $amount_paid; //set Text color on balance - if($balance > 0){ + if ($balance > 0) { $balance_text_color = "text-danger font-weight-bold"; }else{ $balance_text_color = ""; @@ -268,13 +268,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    Name Address Contact Billing Action Billing Action


    @@ -285,12 +285,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    @@ -300,15 +300,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); } ?> - +

    @@ -316,7 +316,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); } ?> - +     		Balance
    diff --git a/companies.php b/companies.php index ca3964ca..dcd937b6 100644 --- a/companies.php +++ b/companies.php @@ -1,6 +1,6 @@
    - +
    @@ -41,7 +41,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    - "> + "> @@ -54,7 +54,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); @@ -386,7 +386,7 @@ $vendors_added = $row['vendors_added']; 0 && $income_for_month > $largest_income_month){ + if ($income_for_month > 0 && $income_for_month > $largest_income_month) { $largest_income_month = $income_for_month; } @@ -544,7 +544,7 @@ var myLineChart = new Chart(ctx, { $income_for_month = $payments_for_month + $revenues_for_month; - if($income_for_month > 0 && $income_for_month > $largest_income_month){ + if ($income_for_month > 0 && $income_for_month > $largest_income_month) { $largest_income_month = $income_for_month; } @@ -580,7 +580,7 @@ var myLineChart = new Chart(ctx, { $row = mysqli_fetch_array($sql_projected); $invoice_for_month = $row['invoice_amount_for_month']; - if($invoice_for_month > 0 && $invoice_for_month > $largest_invoice_month){ + if ($invoice_for_month > 0 && $invoice_for_month > $largest_invoice_month) { $largest_invoice_month = $invoice_for_month; } @@ -616,7 +616,7 @@ var myLineChart = new Chart(ctx, { $row = mysqli_fetch_array($sql_expenses); $expenses_for_month = $row['expense_amount_for_month']; - if($expenses_for_month > 0 && $expenses_for_month > $largest_expense_month){ + if ($expenses_for_month > 0 && $expenses_for_month > $largest_expense_month) { $largest_expense_month = $expenses_for_month; } @@ -693,7 +693,7 @@ var myLineChart = new Chart(ctx, { $trip_miles_for_month = $row['trip_miles_for_month']; $largest_trip_miles_month = 0; - if($trip_miles_for_month > 0 && $trip_miles_for_month > $largest_trip_miles_month){ + if ($trip_miles_for_month > 0 && $trip_miles_for_month > $largest_trip_miles_month) { $largest_trip_miles_month = $trip_miles_for_month; } @@ -752,7 +752,7 @@ var myPieChart = new Chart(ctx, { labels: [ 0 AND YEAR(expense_date) = $year AND categories.company_id = $session_company_id"); - while($row = mysqli_fetch_array($sql_categories)){ + while ($row = mysqli_fetch_array($sql_categories)) { $category_name = json_encode($row['category_name']); echo "$category_name,"; } @@ -821,7 +821,7 @@ var myPieChart = new Chart(ctx, { data: [ 0 AND YEAR(expense_date) = $year AND categories.company_id = $session_company_id"); - while($row = mysqli_fetch_array($sql_categories)){ + while ($row = mysqli_fetch_array($sql_categories)) { $category_id = $row['category_id']; $sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS expense_amount_for_year FROM expenses WHERE expense_category_id = $category_id AND YEAR(expense_date) = $year"); @@ -836,7 +836,7 @@ var myPieChart = new Chart(ctx, { backgroundColor: [ 0 AND YEAR(expense_date) = $year AND categories.company_id = $session_company_id"); - while($row = mysqli_fetch_array($sql_categories)){ + while ($row = mysqli_fetch_array($sql_categories)) { $category_color = json_encode($row['category_color']); echo "$category_color,"; } @@ -862,7 +862,7 @@ var myPieChart = new Chart(ctx, { labels: [ CURRENT_DATABASE_VERSION){ +if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { // We need updates! - if(CURRENT_DATABASE_VERSION == '0.0.1'){ + if (CURRENT_DATABASE_VERSION == '0.0.1') { // Insert queries here required to update to DB version 0.0.2 mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_module_enable_itdoc` TINYINT(1) DEFAULT 1 AFTER `config_backup_path`"); @@ -28,7 +28,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.0.2'"); } - if(CURRENT_DATABASE_VERSION == '0.0.2'){ + if (CURRENT_DATABASE_VERSION == '0.0.2') { // Insert queries here required to update to DB version 0.0.3 // Add document content raw column & index @@ -36,7 +36,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ // Populate content raw column with existing document data $documents_sql = mysqli_query($mysqli, "SELECT * FROM `documents`"); - while($row = mysqli_fetch_array($documents_sql)){ + while ($row = mysqli_fetch_array($documents_sql)) { $id = $row['document_id']; $name = $row['document_name']; $content = $row['document_content']; @@ -52,7 +52,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.0.3'"); } - if(CURRENT_DATABASE_VERSION == '0.0.3'){ + if (CURRENT_DATABASE_VERSION == '0.0.3') { // Insert queries here required to update to DB version 0.0.4 // mysqli_query($mysqli, "ALTER TABLE ....."); @@ -151,7 +151,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ } - if(CURRENT_DATABASE_VERSION == '0.0.4'){ + if (CURRENT_DATABASE_VERSION == '0.0.4') { // Queries here required to update to DB version 0.0.5 mysqli_query($mysqli, "ALTER TABLE `assets` DROP `asset_meshcentral_id`;"); @@ -162,7 +162,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.0.5'"); } - if(CURRENT_DATABASE_VERSION == '0.0.5'){ + if (CURRENT_DATABASE_VERSION == '0.0.5') { // Insert queries here required to update to DB version 0.0.6 mysqli_query($mysqli, "UPDATE documents SET document_folder_id = 0"); @@ -175,7 +175,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE settings SET config_current_database_version = '0.0.6'"); } - if(CURRENT_DATABASE_VERSION == '0.0.6'){ + if (CURRENT_DATABASE_VERSION == '0.0.6') { // Insert queries here required to update to DB version 0.0.7 mysqli_query($mysqli, "ALTER TABLE contacts ADD contact_department VARCHAR(200) NULL AFTER contact_title"); mysqli_query($mysqli, "DROP TABLE departments"); @@ -184,7 +184,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.0.7'"); } - if(CURRENT_DATABASE_VERSION == '0.0.7'){ + if (CURRENT_DATABASE_VERSION == '0.0.7') { // Insert queries here required to update to DB version 0.0.8 // Add contact_department column to tables without it (fresh installs) - this will cause an error if it already exists so catch and discard it @@ -198,7 +198,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.0.8'"); } - if(CURRENT_DATABASE_VERSION == '0.0.8'){ + if (CURRENT_DATABASE_VERSION == '0.0.8') { // Insert queries here required to update to DB version 0.0.9 mysqli_query($mysqli, "ALTER TABLE `revenues` CHANGE `revenue_created_at` `revenue_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, CHANGE `revenue_updated_at` `revenue_updated_at` DATETIME on update CURRENT_TIMESTAMP NULL DEFAULT NULL; "); @@ -207,7 +207,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.0.9'"); } - if(CURRENT_DATABASE_VERSION == '0.0.9'){ + if (CURRENT_DATABASE_VERSION == '0.0.9') { // Insert queries here required to update to DB version 0.0.9 // Remove unused tables mysqli_query($mysqli, "DROP TABLE contracts"); @@ -221,7 +221,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.0'"); } - if(CURRENT_DATABASE_VERSION == '0.1.0'){ + if (CURRENT_DATABASE_VERSION == '0.1.0') { // Insert queries here required to update to DB version 0.1.1 // Logs don't get archived mysqli_query($mysqli, "ALTER TABLE `logs` DROP `log_archived_at`"); @@ -241,7 +241,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.1'"); } - if(CURRENT_DATABASE_VERSION == '0.1.1'){ + if (CURRENT_DATABASE_VERSION == '0.1.1') { // Insert queries here required to update to DB version 0.1.2 // Create Many to Many Relationship tables for Assets, Contacts, Software and Vendors @@ -265,7 +265,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.2'"); } - if(CURRENT_DATABASE_VERSION == '0.1.2'){ + if (CURRENT_DATABASE_VERSION == '0.1.2') { // Insert queries here required to update to DB version 0.1.3 mysqli_query($mysqli, "ALTER TABLE `logs` ADD `log_entity_id` INT NOT NULL DEFAULT '0' AFTER `log_user_id`"); @@ -273,7 +273,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.3'"); } - if(CURRENT_DATABASE_VERSION == '0.1.3'){ + if (CURRENT_DATABASE_VERSION == '0.1.3') { // Insert queries here required to update to DB version 0.1.4 mysqli_query($mysqli, "ALTER TABLE assets ADD asset_status VARCHAR(200) NULL AFTER asset_mac"); @@ -281,7 +281,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.4'"); } - if(CURRENT_DATABASE_VERSION == '0.1.4'){ + if (CURRENT_DATABASE_VERSION == '0.1.4') { // Insert queries here required to update to DB version 0.1.5 mysqli_query($mysqli, "ALTER TABLE `domains` ADD `domain_txt` TEXT NULL DEFAULT NULL AFTER `domain_mail_servers`"); @@ -289,7 +289,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.5'"); } - if(CURRENT_DATABASE_VERSION == '0.1.5'){ + if (CURRENT_DATABASE_VERSION == '0.1.5') { // Insert queries here required to update to DB version 0.1.6 // Remove Mailing List Tables mysqli_query($mysqli, "DROP TABLE campaigns"); @@ -299,7 +299,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.6'"); } - if(CURRENT_DATABASE_VERSION == '0.1.6'){ + if (CURRENT_DATABASE_VERSION == '0.1.6') { // Insert queries here required to update to DB version 0.1.7 //Remove custom links mysqli_query($mysqli, "DROP TABLE custom_links"); @@ -307,7 +307,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.7'"); } - if(CURRENT_DATABASE_VERSION == '0.1.7'){ + if (CURRENT_DATABASE_VERSION == '0.1.7') { // Insert queries here required to update to DB version 0.1.8 mysqli_query($mysqli, "ALTER TABLE `settings` DROP `config_backup_enable`"); mysqli_query($mysqli, "ALTER TABLE `settings` DROP `config_backup_path`"); @@ -316,14 +316,14 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.8'"); } - if(CURRENT_DATABASE_VERSION == '0.1.8'){ + if (CURRENT_DATABASE_VERSION == '0.1.8') { // Insert queries here required to update to DB version 0.1.9 mysqli_query($mysqli, "ALTER TABLE `settings` DROP `config_base_url`"); // Then, update the database to the next sequential version mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.9'"); } - if(CURRENT_DATABASE_VERSION == '0.1.9'){ + if (CURRENT_DATABASE_VERSION == '0.1.9') { // Insert queries here required to update to DB version 0.2.0 // Allow contacts to reset their portal password mysqli_query($mysqli, "ALTER TABLE contacts ADD contact_password_reset_token VARCHAR(200) NULL DEFAULT NULL AFTER contact_password_hash"); @@ -332,7 +332,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.0'"); } - if(CURRENT_DATABASE_VERSION == '0.2.0'){ + if (CURRENT_DATABASE_VERSION == '0.2.0') { //Insert queries here required to update to DB version 0.2.1 mysqli_query($mysqli, "ALTER TABLE `vendors` @@ -369,7 +369,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.1'"); } - if(CURRENT_DATABASE_VERSION == '0.2.1'){ + if (CURRENT_DATABASE_VERSION == '0.2.1') { // Insert queries here required to update to DB version 0.2.2 mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ticket_email_parse` INT(1) NOT NULL DEFAULT '0' AFTER `config_ticket_from_email`"); mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_imap_host` VARCHAR(200) NULL DEFAULT NULL AFTER `config_mail_from_name`, ADD `config_imap_port` INT(5) NULL DEFAULT NULL AFTER `config_imap_host`, ADD `config_imap_encryption` VARCHAR(200) NULL DEFAULT NULL AFTER `config_imap_port`;"); @@ -378,7 +378,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.2'"); } - if(CURRENT_DATABASE_VERSION == '0.2.2'){ + if (CURRENT_DATABASE_VERSION == '0.2.2') { // Insert queries here required to update to DB version 0.2.3 // Add contact_important field to those who don't have it (installed before March 2022) @@ -392,7 +392,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.3'"); } - if(CURRENT_DATABASE_VERSION == '0.2.3'){ + if (CURRENT_DATABASE_VERSION == '0.2.3') { //Create New interfaces Table mysqli_query($mysqli, "CREATE TABLE `interfaces` (`interface_id` int(11) AUTO_INCREMENT PRIMARY KEY, @@ -413,18 +413,18 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ } - if(CURRENT_DATABASE_VERSION == '0.2.4'){ + if (CURRENT_DATABASE_VERSION == '0.2.4') { mysqli_query($mysqli, "CREATE TABLE `contact_assets` (`contact_id` int(11) NOT NULL,`asset_id` int(11) NOT NULL, PRIMARY KEY (`contact_id`,`asset_id`))"); mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.5'"); } - if(CURRENT_DATABASE_VERSION == '0.2.5'){ + if (CURRENT_DATABASE_VERSION == '0.2.5') { mysqli_query($mysqli, "ALTER TABLE `users` ADD `user_status` TINYINT(1) DEFAULT 1 AFTER `user_password`"); mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.6'"); } - if(CURRENT_DATABASE_VERSION == '0.2.6'){ + if (CURRENT_DATABASE_VERSION == '0.2.6') { // Insert queries here required to update to DB version 0.2.7 mysqli_query($mysqli, "ALTER TABLE `contacts` ADD `contact_token_expire` DATETIME NULL DEFAULT NULL AFTER `contact_password_reset_token`"); @@ -436,7 +436,7 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.7'"); } - if(CURRENT_DATABASE_VERSION == '0.2.7'){ + if (CURRENT_DATABASE_VERSION == '0.2.7') { mysqli_query($mysqli, "ALTER TABLE `vendors` ADD `vendor_template` TINYINT(1) DEFAULT 0 AFTER `vendor_notes`"); mysqli_query($mysqli, "ALTER TABLE `software` ADD `software_template` TINYINT(1) DEFAULT 0 AFTER `software_notes`"); @@ -446,14 +446,14 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.8'"); } - if(CURRENT_DATABASE_VERSION == '0.2.8'){ + if (CURRENT_DATABASE_VERSION == '0.2.8') { mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_theme` VARCHAR(200) DEFAULT 'blue' AFTER `config_module_enable_ticketing`"); mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.2.9'"); } -//if(CURRENT_DATABASE_VERSION == '0.2.9'){ +//if (CURRENT_DATABASE_VERSION == '0.2.9') { // Insert queries here required to update to DB version 0.3.0 // Then, update the database to the next sequential version diff --git a/expense_add_modal.php b/expense_add_modal.php index 2d935f95..366ecec6 100644 --- a/expense_add_modal.php +++ b/expense_add_modal.php @@ -44,7 +44,7 @@ - + @@ -119,7 +119,7 @@ diff --git a/expense_copy_modal.php b/expense_copy_modal.php index 35b38c86..7ec36350 100644 --- a/expense_copy_modal.php +++ b/expense_copy_modal.php @@ -45,7 +45,7 @@ - + - + - + '$expense_created_at' OR account_archived_at IS NULL) AND company_id = $session_company_id ORDER BY account_name ASC"); - while($row = mysqli_fetch_array($sql_accounts)){ + while ($row = mysqli_fetch_array($sql_accounts)) { $account_id_select = $row['account_id']; $account_name_select = htmlentities($row['account_name']); $opening_balance = floatval($row['opening_balance']); @@ -67,7 +67,7 @@ $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses; ?> - + '$expense_created_at' OR vendor_archived_at IS NULL) AND company_id = $session_company_id ORDER BY vendor_name ASC"); - while($row = mysqli_fetch_array($sql_select)){ + while ($row = mysqli_fetch_array($sql_select)) { $vendor_id_select = $row['vendor_id']; $vendor_name_select = htmlentities($row['vendor_name']); ?> - + '$expense_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id ORDER BY category_name ASC"); - while($row = mysqli_fetch_array($sql_select)){ + while ($row = mysqli_fetch_array($sql_select)) { $category_id_select = $row['category_id']; $category_name_select = htmlentities($row['category_name']); ?> - + - +
    "> diff --git a/expenses.php b/expenses.php index b2358396..c20f16b3 100644 --- a/expenses.php +++ b/expenses.php @@ -2,50 +2,50 @@ //$o = "DESC"; -if(!empty($_GET['sb'])){ +if (!empty($_GET['sb'])) { $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb'])); }else{ $sb = "expense_date"; } // Reverse default sort -if(!isset($_GET['o'])){ +if (!isset($_GET['o'])) { $o = "DESC"; $disp = "ASC"; } -if(empty($_GET['canned_date'])){ +if (empty($_GET['canned_date'])) { //Prevents lots of undefined variable errors. // $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00 $_GET['canned_date'] = 'custom'; } //Date Filter -if($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])){ +if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) { $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf'])); $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt'])); -}elseif($_GET['canned_date'] == "today"){ +}elseif ($_GET['canned_date'] == "today") { $dtf = date('Y-m-d'); $dtt = date('Y-m-d'); -}elseif($_GET['canned_date'] == "yesterday"){ +}elseif ($_GET['canned_date'] == "yesterday") { $dtf = date('Y-m-d',strtotime("yesterday")); $dtt = date('Y-m-d',strtotime("yesterday")); -}elseif($_GET['canned_date'] == "thisweek"){ +}elseif ($_GET['canned_date'] == "thisweek") { $dtf = date('Y-m-d',strtotime("monday this week")); $dtt = date('Y-m-d'); -}elseif($_GET['canned_date'] == "lastweek"){ +}elseif ($_GET['canned_date'] == "lastweek") { $dtf = date('Y-m-d',strtotime("monday last week")); $dtt = date('Y-m-d',strtotime("sunday last week")); -}elseif($_GET['canned_date'] == "thismonth"){ +}elseif ($_GET['canned_date'] == "thismonth") { $dtf = date('Y-m-01'); $dtt = date('Y-m-d'); -}elseif($_GET['canned_date'] == "lastmonth"){ +}elseif ($_GET['canned_date'] == "lastmonth") { $dtf = date('Y-m-d',strtotime("first day of last month")); $dtt = date('Y-m-d',strtotime("last day of last month")); -}elseif($_GET['canned_date'] == "thisyear"){ +}elseif ($_GET['canned_date'] == "thisyear") { $dtf = date('Y-01-01'); $dtt = date('Y-m-d'); -}elseif($_GET['canned_date'] == "lastyear"){ +}elseif ($_GET['canned_date'] == "lastyear") { $dtf = date('Y-m-d',strtotime("first day of january last year")); $dtt = date('Y-m-d',strtotime("last day of december last year")); }else{ @@ -83,7 +83,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    - +
    @@ -96,21 +96,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    -
    " id="advancedFilter"> +
    " id="advancedFilter">
    @@ -132,7 +132,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    Name Address
    - + "> diff --git a/company_edit_modal.php b/company_edit_modal.php index 4bc0e4ad..a6d13ad9 100644 --- a/company_edit_modal.php +++ b/company_edit_modal.php @@ -102,7 +102,7 @@ @@ -155,7 +155,7 @@ @@ -170,7 +170,7 @@ diff --git a/cron.php b/cron.php index aaca58bb..465649a4 100644 --- a/cron.php +++ b/cron.php @@ -8,7 +8,7 @@ $sql_companies = mysqli_query($mysqli,"SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id"); -while($row = mysqli_fetch_array($sql_companies)){ +while ($row = mysqli_fetch_array($sql_companies)) { $company_id = $row['company_id']; $company_name = $row['company_name']; $company_phone = formatPhoneNumber($row['company_phone']); @@ -36,7 +36,7 @@ while($row = mysqli_fetch_array($sql_companies)){ // Set Currency Format $currency_format = numfmt_create($company_locale, NumberFormatter::CURRENCY); - if($config_enable_cron == 1){ + if ($config_enable_cron == 1) { //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Cron', log_action = 'Started', log_description = 'Cron started for $company_name', company_id = $company_id"); @@ -47,7 +47,7 @@ while($row = mysqli_fetch_array($sql_companies)){ $domainAlertArray = [1,7,14,30,90,120]; - foreach($domainAlertArray as $day){ + foreach($domainAlertArray as $day) { //Get Domains Expiring $sql = mysqli_query($mysqli,"SELECT * FROM domains @@ -56,7 +56,7 @@ while($row = mysqli_fetch_array($sql_companies)){ AND domains.company_id = $company_id" ); - while($row = mysqli_fetch_array($sql)){ + while ($row = mysqli_fetch_array($sql)) { $domain_id = $row['domain_id']; $domain_name = mysqli_real_escape_string($mysqli,$row['domain_name']); $domain_expire = $row['domain_expire']; @@ -73,7 +73,7 @@ while($row = mysqli_fetch_array($sql_companies)){ $certificateAlertArray = [1,7,14,30,90,120]; - foreach($certificateAlertArray as $day){ + foreach($certificateAlertArray as $day) { //Get Certs Expiring $sql = mysqli_query($mysqli,"SELECT * FROM certificates @@ -82,7 +82,7 @@ while($row = mysqli_fetch_array($sql_companies)){ AND certificates.company_id = $company_id" ); - while($row = mysqli_fetch_array($sql)){ + while ($row = mysqli_fetch_array($sql)) { $certificate_id = $row['certificate_id']; $certificate_name = mysqli_real_escape_string($mysqli,$row['certificate_name']); $certificate_domain = $row['certificate_domain']; @@ -100,7 +100,7 @@ while($row = mysqli_fetch_array($sql_companies)){ $warranty_alert_array = [1,7,14,30,90,120]; - foreach($warranty_alert_array as $day){ + foreach($warranty_alert_array as $day) { //Get Asset Warranty Expiring $sql = mysqli_query($mysqli,"SELECT * FROM assets @@ -109,7 +109,7 @@ while($row = mysqli_fetch_array($sql_companies)){ AND assets.company_id = $company_id" ); - while($row = mysqli_fetch_array($sql)){ + while ($row = mysqli_fetch_array($sql)) { $asset_id = $row['asset_id']; $asset_name = mysqli_real_escape_string($mysqli,$row['asset_name']); $asset_warranty_expire = $row['asset_warranty_expire']; @@ -131,8 +131,8 @@ while($row = mysqli_fetch_array($sql_companies)){ // Get scheduled tickets for today $sql_scheduled_tickets = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets WHERE scheduled_ticket_next_run = '$today_text'"); - if(mysqli_num_rows($sql_scheduled_tickets) > 0){ - while($row = mysqli_fetch_array($sql_scheduled_tickets)){ + if (mysqli_num_rows($sql_scheduled_tickets) > 0) { + while ($row = mysqli_fetch_array($sql_scheduled_tickets)) { $schedule_id = $row['scheduled_ticket_id']; $subject = mysqli_real_escape_string($mysqli,$row['scheduled_ticket_subject']); $details = mysqli_real_escape_string($mysqli,$row['scheduled_ticket_details']); @@ -156,24 +156,24 @@ while($row = mysqli_fetch_array($sql_companies)){ mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = 'System created scheduled $frequency ticket - $subject', log_created_at = NOW(), log_client_id = $client_id, company_id = $company_id, log_user_id = $created_id"); // Set the next run date - if($frequency == "weekly"){ + if ($frequency == "weekly") { // Note: We seemingly have to initialize a new datetime for each loop to avoid stacking the dates $now = new DateTime(); $next_run = date_add($now, date_interval_create_from_date_string('1 week')); } - elseif($frequency == "monthly"){ + elseif ($frequency == "monthly") { $now = new DateTime(); $next_run = date_add($now, date_interval_create_from_date_string('1 month')); } - elseif($frequency == "quarterly"){ + elseif ($frequency == "quarterly") { $now = new DateTime(); $next_run = date_add($now, date_interval_create_from_date_string('3 months')); } - elseif($frequency == "biannually"){ + elseif ($frequency == "biannually") { $now = new DateTime(); $next_run = date_add($now, date_interval_create_from_date_string('6 months')); } - elseif($frequency == "annually"){ + elseif ($frequency == "annually") { $now = new DateTime(); $next_run = date_add($now, date_interval_create_from_date_string('12 months')); } @@ -201,7 +201,7 @@ while($row = mysqli_fetch_array($sql_companies)){ //$invoiceAlertArray = [$config_invoice_overdue_reminders]; $invoiceAlertArray = [30,60,90,120,150,180,210,240,270,300,330,360,390,420,450,480,510,540,570,590,620]; - foreach($invoiceAlertArray as $day){ + foreach($invoiceAlertArray as $day) { $sql = mysqli_query($mysqli,"SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id @@ -214,7 +214,7 @@ while($row = mysqli_fetch_array($sql_companies)){ ORDER BY invoice_number DESC" ); - while($row = mysqli_fetch_array($sql)){ + while ($row = mysqli_fetch_array($sql)) { $invoice_id = $row['invoice_id']; $invoice_prefix = $row['invoice_prefix']; $invoice_number = $row['invoice_number']; @@ -259,7 +259,7 @@ while($row = mysqli_fetch_array($sql_companies)){ //Loop through all recurring that match today's date and is active $sql_recurring = mysqli_query($mysqli,"SELECT * FROM recurring LEFT JOIN clients ON client_id = recurring_client_id WHERE recurring_next_date = CURDATE() AND recurring_status = 1 AND recurring.company_id = $company_id"); - while($row = mysqli_fetch_array($sql_recurring)){ + while ($row = mysqli_fetch_array($sql_recurring)) { $recurring_id = $row['recurring_id']; $recurring_scope = $row['recurring_scope']; $recurring_frequency = $row['recurring_frequency']; @@ -294,7 +294,7 @@ while($row = mysqli_fetch_array($sql_companies)){ //Copy Items from original recurring invoice to new invoice $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_id = $recurring_id ORDER BY item_id ASC"); - while($row = mysqli_fetch_array($sql_invoice_items)){ + while ($row = mysqli_fetch_array($sql_invoice_items)) { $item_id = $row['item_id']; $item_name = mysqli_real_escape_string($mysqli,$row['item_name']); //SQL Escape incase of , $item_description = mysqli_real_escape_string($mysqli,$row['item_description']); //SQL Escape incase of , @@ -318,7 +318,7 @@ while($row = mysqli_fetch_array($sql_companies)){ mysqli_query($mysqli,"UPDATE recurring SET recurring_last_sent = CURDATE(), recurring_next_date = DATE_ADD(CURDATE(), INTERVAL 1 $recurring_frequency), recurring_updated_at = NOW() WHERE recurring_id = $recurring_id"); - if($config_recurring_auto_send_invoice == 1){ + if ($config_recurring_auto_send_invoice == 1) { $sql = mysqli_query($mysqli,"SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id LEFT JOIN contacts ON contact_id = primary_contact diff --git a/dashboard_financial.php b/dashboard_financial.php index ac9ae6f9..041449ff 100644 --- a/dashboard_financial.php +++ b/dashboard_financial.php @@ -114,13 +114,13 @@ $vendors_added = $row['vendors_added'];
    - "> + "> @@ -146,7 +146,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); "; @@ -184,7 +184,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    " download="">Download
    diff --git a/functions.php b/functions.php index 92a4172f..dd37a0f2 100644 --- a/functions.php +++ b/functions.php @@ -43,7 +43,7 @@ function key32gen() } function initials($str) { - if(!empty($str)){ + if (!empty($str)) { $ret = ''; foreach (explode(' ', $str) as $word) $ret .= strtoupper($word[0]); @@ -69,8 +69,8 @@ function get_user_agent() { function get_ip() { - if(defined("CONST_GET_IP_METHOD")){ - if(CONST_GET_IP_METHOD == "HTTP_X_FORWARDED_FOR"){ + if (defined("CONST_GET_IP_METHOD")) { + if (CONST_GET_IP_METHOD == "HTTP_X_FORWARDED_FOR") { $ip = getenv('HTTP_X_FORWARDED_FOR'); } @@ -132,7 +132,7 @@ function get_os($user_os) { return $os_platform; } -function get_device(){ +function get_device() { $tablet_browser = 0; $mobile_browser = 0; if (preg_match('/(tablet|ipad|playbook)|(android(?!.*(mobi|opera mini)))/i', strtolower($_SERVER['HTTP_USER_AGENT']))) { @@ -194,7 +194,7 @@ function truncate($text, $chars) { function formatPhoneNumber($phoneNumber) { $phoneNumber = preg_replace('/[^0-9]/','',$phoneNumber); - if(strlen($phoneNumber) > 10) { + if (strlen($phoneNumber) > 10) { $countryCode = substr($phoneNumber, 0, strlen($phoneNumber)-10); $areaCode = substr($phoneNumber, -10, 3); $nextThree = substr($phoneNumber, -7, 3); @@ -202,14 +202,14 @@ function formatPhoneNumber($phoneNumber) { $phoneNumber = '+'.$countryCode.' ('.$areaCode.') '.$nextThree.'-'.$lastFour; } - else if(strlen($phoneNumber) == 10) { + else if (strlen($phoneNumber) == 10) { $areaCode = substr($phoneNumber, 0, 3); $nextThree = substr($phoneNumber, 3, 3); $lastFour = substr($phoneNumber, 6, 4); $phoneNumber = '('.$areaCode.') '.$nextThree.'-'.$lastFour; } - else if(strlen($phoneNumber) == 7) { + else if (strlen($phoneNumber) == 7) { $nextThree = substr($phoneNumber, 0, 3); $lastFour = substr($phoneNumber, 3, 4); @@ -227,7 +227,7 @@ function mkdir_missing($dir) { // Called during initial setup // Encrypts the master key with the user's password -function setupFirstUserSpecificKey($user_password, $site_encryption_master_key){ +function setupFirstUserSpecificKey($user_password, $site_encryption_master_key) { $iv = bin2hex(random_bytes(8)); $salt = bin2hex(random_bytes(8)); @@ -247,7 +247,7 @@ function setupFirstUserSpecificKey($user_password, $site_encryption_master_key){ * New Users: Requires the admin setting up their account have a Specific/Session key configured * Password Changes: Will use the current info in the session. */ -function encryptUserSpecificKey($user_password){ +function encryptUserSpecificKey($user_password) { $iv = bin2hex(random_bytes(8)); $salt = bin2hex(random_bytes(8)); @@ -273,7 +273,7 @@ function encryptUserSpecificKey($user_password){ // Given a ciphertext (incl. IV) and the user's password, returns the site master key // Ran at login, to facilitate generateUserSessionKey -function decryptUserSpecificKey($user_encryption_ciphertext, $user_password){ +function decryptUserSpecificKey($user_encryption_ciphertext, $user_password) { //Get the IV, salt and ciphertext $salt = substr($user_encryption_ciphertext, 0, 16); $iv = substr($user_encryption_ciphertext, 16, 16); @@ -294,7 +294,7 @@ Generates what is probably best described as a session key (ephemeral-ish) - Only the user can decrypt their session ciphertext to get the master key - Encryption key never hits the disk in cleartext */ -function generateUserSessionKey($site_encryption_master_key){ +function generateUserSessionKey($site_encryption_master_key) { // Generate both of these using bin2hex(random_bytes(8)) $user_encryption_session_key = bin2hex(random_bytes(8)); @@ -307,7 +307,7 @@ function generateUserSessionKey($site_encryption_master_key){ // Give the user "their" key as a cookie include('config.php'); - if($config_https_only){ + if ($config_https_only) { setcookie("user_encryption_session_key", "$user_encryption_session_key", ['path' => '/','secure' => true,'httponly' => true,'samesite' => 'None']); } else{ setcookie("user_encryption_session_key", $user_encryption_session_key, 0, "/"); @@ -316,7 +316,7 @@ function generateUserSessionKey($site_encryption_master_key){ } // Decrypts an encrypted password (website/asset login), returns it as a string -function decryptLoginEntry($login_password_ciphertext){ +function decryptLoginEntry($login_password_ciphertext) { // Split the login into IV and Ciphertext $login_iv = substr($login_password_ciphertext, 0, 16); @@ -337,7 +337,7 @@ function decryptLoginEntry($login_password_ciphertext){ } // Encrypts a website/asset login password -function encryptLoginEntry($login_password_cleartext){ +function encryptLoginEntry($login_password_cleartext) { $iv = bin2hex(random_bytes(8)); // Get the user session info. @@ -356,10 +356,10 @@ function encryptLoginEntry($login_password_cleartext){ } // Get domain expiration date -function getDomainExpirationDate($name){ +function getDomainExpirationDate($name) { // Only run if we think the domain is valid - if(!filter_var($name, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) { + if (!filter_var($name, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) { return '0000-00-00'; } @@ -368,8 +368,8 @@ function getDomainExpirationDate($name){ curl_setopt($ch, CURLOPT_RETURNTRANSFER,1); $response = json_decode(curl_exec($ch),1); - if($response){ - if(is_array($response['expiration_date'])){ + if ($response) { + if (is_array($response['expiration_date'])) { $expiry = new DateTime($response['expiration_date'][1]); } else{ @@ -384,12 +384,12 @@ function getDomainExpirationDate($name){ } // Get domain general info (whois + NS/A/MX records) -function getDomainRecords($name){ +function getDomainRecords($name) { $records = array(); // Only run if we think the domain is valid - if(!filter_var($name, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) { + if (!filter_var($name, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) { $records['a'] = ''; $records['ns'] = ''; $records['mx'] = ''; @@ -409,13 +409,13 @@ function getDomainRecords($name){ // Used to automatically attempt to get SSL certificates as part of adding domains // The logic for the fetch (sync) button on the client_certificates page is in ajax.php, and allows ports other than 443 -function getSSL($name){ +function getSSL($name) { $certificate = array(); $certificate['success'] = FALSE; // Only run if we think the domain is valid - if(!filter_var($name, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) { + if (!filter_var($name, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) { $certificate['expire'] = ''; $certificate['issued_by'] = ''; $certificate['public_key'] = ''; @@ -428,12 +428,12 @@ function getSSL($name){ $read = stream_socket_client($socket, $errno, $errstr, 5, STREAM_CLIENT_CONNECT, $get); // If the socket connected - if($read){ + if ($read) { $cert = stream_context_get_params($read); $cert_public_key_obj = openssl_x509_parse($cert['options']['ssl']['peer_certificate']); openssl_x509_export($cert['options']['ssl']['peer_certificate'], $export); - if($cert_public_key_obj){ + if ($cert_public_key_obj) { $certificate['success'] = TRUE; $certificate['expire'] = date('Y-m-d', $cert_public_key_obj['validTo_time_t']); $certificate['issued_by'] = strip_tags($cert_public_key_obj['issuer']['O']); @@ -444,7 +444,7 @@ function getSSL($name){ return $certificate; } -function strto_AZaz09($string){ +function strto_AZaz09($string) { $string = ucwords(strtolower($string)); // Replace spaces with _ @@ -458,8 +458,8 @@ function strto_AZaz09($string){ // Cross-Site Request Forgery check for sensitive functions // Validates the CSRF token provided matches the one in the users session -function validateCSRFToken($token){ - if(hash_equals($token, $_SESSION['csrf_token'])){ +function validateCSRFToken($token) { + if (hash_equals($token, $_SESSION['csrf_token'])) { return true; } else{ @@ -477,8 +477,8 @@ function validateCSRFToken($token){ * Accountant - 1 */ -function validateAdminRole(){ - if(!isset($_SESSION['user_role']) || $_SESSION['user_role'] != 3){ +function validateAdminRole() { + if (!isset($_SESSION['user_role']) || $_SESSION['user_role'] != 3) { $_SESSION['alert_type'] = "danger"; $_SESSION['alert_message'] = WORDING_ROLECHECK_FAILED; header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -486,8 +486,8 @@ function validateAdminRole(){ } } -function validateTechRole(){ - if(!isset($_SESSION['user_role']) || $_SESSION['user_role'] == 1){ +function validateTechRole() { + if (!isset($_SESSION['user_role']) || $_SESSION['user_role'] == 1) { $_SESSION['alert_type'] = "danger"; $_SESSION['alert_message'] = WORDING_ROLECHECK_FAILED; header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -495,8 +495,8 @@ function validateTechRole(){ } } -function validateAccountantRole(){ - if(!isset($_SESSION['user_role']) || $_SESSION['user_role'] == 2){ +function validateAccountantRole() { + if (!isset($_SESSION['user_role']) || $_SESSION['user_role'] == 2) { $_SESSION['alert_type'] = "danger"; $_SESSION['alert_message'] = WORDING_ROLECHECK_FAILED; header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -505,7 +505,7 @@ function validateAccountantRole(){ } // Send a single email to a single recipient -function sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_password, $config_smtp_encryption, $config_smtp_port, $from_email, $from_name, $to_email, $to_name, $subject, $body){ +function sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_password, $config_smtp_encryption, $config_smtp_port, $from_email, $from_name, $to_email, $to_name, $subject, $body) { $mail = new PHPMailer(true); @@ -540,7 +540,7 @@ function sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_ return true; } - catch(Exception $e){ + catch(Exception $e) { // If we couldn't send the message return the error so we can log it return "Message not sent. Mailer Error: {$mail->ErrorInfo}"; } diff --git a/global_search.php b/global_search.php index 2d294143..519238e3 100644 --- a/global_search.php +++ b/global_search.php @@ -2,12 +2,12 @@
    - 0){ ?> + 0) { ?> @@ -48,7 +48,7 @@ if(isset($_GET['query'])){
    - 0){ ?> + 0) { ?> @@ -94,7 +94,7 @@ if(isset($_GET['query'])){ - 0){ ?> + 0) { ?>
    @@ -148,7 +148,7 @@ if(isset($_GET['query'])){
    - 0){ ?> + 0) { ?>
    @@ -190,7 +190,7 @@ if(isset($_GET['query'])){
    @@ -211,7 +211,7 @@ if(isset($_GET['query'])){ - 0){ ?> + 0) { ?>
    @@ -231,7 +231,7 @@ if(isset($_GET['query'])){
    - 0){ ?> + 0) { ?>
    @@ -277,7 +277,7 @@ if(isset($_GET['query'])){
    - 0){ ?> + 0) { ?>
    @@ -326,7 +326,7 @@ if(isset($_GET['query'])){
    = $row['item_view_limit']){ + if ($row['item_active'] !== "1" || $row['item_views'] >= $row['item_view_limit']) { exit("Item cannot be viewed at this time."); } $item_related_id = $row['item_related_id']; $client_id = $row['item_client_id']; - if(empty($row['item_views'])){ + if (empty($row['item_views'])) { $item_views = 0; } else { @@ -40,7 +40,7 @@ if(isset($_GET['id']) && isset($_GET['key'])){ $file_sql = mysqli_query($mysqli, "SELECT * FROM files WHERE file_id = '$item_related_id' AND file_client_id = '$client_id' LIMIT 1"); $file_row = mysqli_fetch_array($file_sql); - if(mysqli_num_rows($file_sql) !== 1 || !$file_row){ + if (mysqli_num_rows($file_sql) !== 1 || !$file_row) { exit("No file."); } diff --git a/guest_header.php b/guest_header.php index dcb436c4..04e26ac7 100644 --- a/guest_header.php +++ b/guest_header.php @@ -46,8 +46,8 @@ $user_agent = strip_tags(mysqli_real_escape_string($mysqli,$_SERVER['HTTP_USER_A diff --git a/guest_pay_invoice.php b/guest_pay_invoice.php index dd97f9b6..1c3c87c7 100644 --- a/guest_pay_invoice.php +++ b/guest_pay_invoice.php @@ -7,14 +7,14 @@ include("config.php"); session_start(); -if(isset($_POST['pay_invoice'])){ +if (isset($_POST['pay_invoice'])) { $email = mysqli_real_escape_string($mysqli,$_POST['email']); $password = md5(mysqli_real_escape_string($mysqli,$_POST['password'])); $sql = mysqli_query($mysqli,"SELECT * FROM users WHERE email = '$email' AND password = '$password'"); - if(mysqli_num_rows($sql) == 1){ + if (mysqli_num_rows($sql) == 1) { $row = mysqli_fetch_array($sql); $_SESSION['logged'] = TRUE; $_SESSION['user_id'] = $row['user_id']; @@ -68,7 +68,7 @@ if(isset($_POST['pay_invoice'])){ - +
    diff --git a/guest_post.php b/guest_post.php index 08a1ede7..411b8355 100644 --- a/guest_post.php +++ b/guest_post.php @@ -5,7 +5,7 @@ include("functions.php"); session_start(); -if(isset($_GET['accept_quote'], $_GET['company_id'], $_GET['url_key'])){ +if (isset($_GET['accept_quote'], $_GET['company_id'], $_GET['url_key'])) { $quote_id = intval($_GET['accept_quote']); $company_id = intval($_GET['company_id']); @@ -13,7 +13,7 @@ if(isset($_GET['accept_quote'], $_GET['company_id'], $_GET['url_key'])){ $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id AND quote_url_key = '$url_key' AND company_id = $company_id"); - if(mysqli_num_rows($sql) == 1){ + if (mysqli_num_rows($sql) == 1) { mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Accepted' WHERE quote_id = $quote_id"); @@ -28,7 +28,7 @@ if(isset($_GET['accept_quote'], $_GET['company_id'], $_GET['url_key'])){ } -if(isset($_GET['decline_quote'], $_GET['company_id'], $_GET['url_key'])){ +if (isset($_GET['decline_quote'], $_GET['company_id'], $_GET['url_key'])) { $quote_id = intval($_GET['decline_quote']); $company_id = intval($_GET['company_id']); @@ -36,7 +36,7 @@ if(isset($_GET['decline_quote'], $_GET['company_id'], $_GET['url_key'])){ $sql = mysqli_query($mysqli,"SELECT * FROM quotes WHERE quote_id = $quote_id AND quote_url_key = '$url_key' AND quote_url_key = '$url_key' AND company_id = $company_id"); - if(mysqli_num_rows($sql) == 1){ + if (mysqli_num_rows($sql) == 1) { mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Declined' WHERE quote_id = $quote_id"); diff --git a/guest_view_invoice.php b/guest_view_invoice.php index 97d30ad6..2309f9ea 100644 --- a/guest_view_invoice.php +++ b/guest_view_invoice.php @@ -2,7 +2,7 @@ Print ');"> Download Pay Online (Coming Soon) @@ -140,7 +140,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){ ">
    - +
    @@ -214,7 +214,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){ $total_tax = 0; $sub_total = 0; - while($row = mysqli_fetch_array($sql_invoice_items)){ + while ($row = mysqli_fetch_array($sql_invoice_items)) { $item_id = $row['item_id']; $item_name = htmlentities($row['item_name']); $item_description = htmlentities($row['item_description']); @@ -251,7 +251,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
    - +
    @@ -266,13 +266,13 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
    - 0){ ?> + 0) { ?> - 0){ ?> + 0) { ?> @@ -309,7 +309,7 @@ var docDefinition = { // Header { columns: [ - + { image: , width: 120 @@ -441,7 +441,7 @@ var docDefinition = { $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id ORDER BY item_id ASC"); - while($row = mysqli_fetch_array($sql_invoice_items)){ + while ($row = mysqli_fetch_array($sql_invoice_items)) { $item_name = $row['item_name']; $item_description = $row['item_description']; $item_quantity = $row['item_quantity']; @@ -719,7 +719,7 @@ var docDefinition = { $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_client_id = $client_id AND invoice_due < CURDATE() AND(invoice_status = 'Sent' OR invoice_status = 'Viewed' OR invoice_status = 'Partial') ORDER BY invoice_date DESC"); - if(mysqli_num_rows($sql) > 1){ + if (mysqli_num_rows($sql) > 1) { ?> @@ -741,7 +741,7 @@ var docDefinition = { - > + > @@ -779,7 +779,7 @@ var docDefinition = { $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_client_id = $client_id AND invoice_due > CURDATE() AND(invoice_status = 'Sent' OR invoice_status = 'Viewed' OR invoice_status = 'Partial') ORDER BY invoice_number DESC"); - if(mysqli_num_rows($sql) > 1){ + if (mysqli_num_rows($sql) > 1) { ?> @@ -801,7 +801,7 @@ var docDefinition = { - > + > @@ -840,7 +840,7 @@ var docDefinition = { $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE invoice_client_id = $client_id AND invoice_status = 'Paid' ORDER BY invoice_date DESC"); - if(mysqli_num_rows($sql) > 1){ + if (mysqli_num_rows($sql) > 1) { ?> @@ -862,7 +862,7 @@ var docDefinition = { - > + > @@ -890,14 +890,14 @@ var docDefinition = { $sql_payments = mysqli_query($mysqli,"SELECT * FROM payments WHERE payment_invoice_id = $invoice_id ORDER BY payment_date DESC"); - while($row = mysqli_fetch_array($sql_payments)){ + while ($row = mysqli_fetch_array($sql_payments)) { $payment_id = $row['payment_id']; $payment_date = $row['payment_date']; $payment_amount = floatval($row['payment_amount']); $payment_currency_code = htmlentities($row['payment_currency_code']); $payment_method = htmlentities($row['payment_method']); $payment_reference = htmlentities($row['payment_reference']); - if(strtotime($payment_date) > strtotime($invoice_due)){ + if (strtotime($payment_date) > strtotime($invoice_due)) { $payment_note = "Late"; $difference = strtotime($payment_date) - strtotime($invoice_due); $days = floor($difference / (60*60*24) ) . " Days"; diff --git a/guest_view_item.php b/guest_view_item.php index adf29c7c..254d4a46 100644 --- a/guest_view_item.php +++ b/guest_view_item.php @@ -11,7 +11,7 @@ include("guest_header.php"); ?>
    Incorrect URL."; include("guest_footer.php"); exit(); @@ -24,14 +24,14 @@ $sql = mysqli_query($mysqli, "SELECT * FROM shared_items WHERE item_id = '$item_ $row = mysqli_fetch_array($sql); // Check we got a result -if(mysqli_num_rows($sql) !== 1 || !$row){ +if (mysqli_num_rows($sql) !== 1 || !$row) { echo "
    No item to view. Check with the person that sent you this link to ensure it is correct and has not expired.
    "; include("guest_footer.php"); exit(); } // Check item share is active & hasn't been viewed too many times -if($row['item_active'] !== "1" || $row['item_views'] >= $row['item_view_limit']){ +if ($row['item_active'] !== "1" || $row['item_views'] >= $row['item_view_limit']) { echo "
    Item cannot be viewed at this time. Check with the person that sent you this link to ensure it is correct and has not expired.
    "; include("guest_footer.php"); exit(); @@ -50,11 +50,11 @@ $item_created = $row['item_created_at']; $item_expire = $row['item_expire_at']; $client_id = $row['item_client_id']; -if($item_type == "Document"){ +if ($item_type == "Document") { $doc_sql = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_id = '$item_related_id' AND document_client_id = '$client_id' LIMIT 1"); $doc_row = mysqli_fetch_array($doc_sql); - if(mysqli_num_rows($doc_sql) !== 1 || !$doc_row){ + if (mysqli_num_rows($doc_sql) !== 1 || !$doc_row) { echo "
    Error retrieving document to view.
    "; include("guest_footer.php"); exit(); @@ -64,7 +64,7 @@ if($item_type == "Document"){ $doc_content = $doc_row['document_content']; echo "

    A document has been shared with you

    "; - if(!empty($item_note)){ + if (!empty($item_note)) { echo "

    Note: $item_note

    "; } echo "
    "; @@ -79,11 +79,11 @@ if($item_type == "Document"){ $name = mysqli_real_escape_string($mysqli, $doc_title); mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Sharing', log_action = 'View', log_description = 'Viewed shared $item_type $name via link', log_client_id = '$client_id', log_created_at = NOW(), log_ip = '$ip', log_user_agent = '$user_agent', company_id = '1'"); -}elseif($item_type == "File"){ +}elseif ($item_type == "File") { $file_sql = mysqli_query($mysqli, "SELECT * FROM files WHERE file_id = '$item_related_id' AND file_client_id = '$client_id' LIMIT 1"); $file_row = mysqli_fetch_array($file_sql); - if(mysqli_num_rows($file_sql) !== 1 || !$file_row){ + if (mysqli_num_rows($file_sql) !== 1 || !$file_row) { echo "
    Error retrieving file.
    "; include("guest_footer.php"); exit(); @@ -92,18 +92,18 @@ if($item_type == "Document"){ $file_name = htmlentities($file_row['file_name']); echo "

    A file has been shared with you

    "; - if(!empty($item_note)){ + if (!empty($item_note)) { echo "

    Note: $item_note

    "; } echo "Download $file_name"; -}elseif($item_type == "Login"){ +}elseif ($item_type == "Login") { $encryption_key = $_GET['ek']; $login_sql = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_id = '$item_related_id' AND login_client_id = '$client_id' LIMIT 1"); $login_row = mysqli_fetch_array($login_sql); - if(mysqli_num_rows($login_sql) !== 1 || !$login_row){ + if (mysqli_num_rows($login_sql) !== 1 || !$login_row) { echo "
    Error retrieving login.
    "; include("guest_footer.php"); exit(); @@ -119,7 +119,7 @@ if($item_type == "Document"){ $login_notes = htmlentities($login_row['login_note']); echo "

    A login entry has been shared with you

    "; - if(!empty($item_note)){ + if (!empty($item_note)) { echo "

    Note: $item_note

    "; } echo "
    "; diff --git a/guest_view_quote.php b/guest_view_quote.php index f2ac1870..c2e6695a 100644 --- a/guest_view_quote.php +++ b/guest_view_quote.php @@ -2,7 +2,7 @@ include("guest_header.php"); -if(isset($_GET['quote_id'], $_GET['url_key'])){ +if (isset($_GET['quote_id'], $_GET['url_key'])) { $url_key = mysqli_real_escape_string($mysqli,$_GET['url_key']); $quote_id = intval($_GET['quote_id']); @@ -17,7 +17,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){ AND quote_url_key = '$url_key'" ); - if(mysqli_num_rows($sql) == 1){ + if (mysqli_num_rows($sql) == 1) { $row = mysqli_fetch_array($sql); @@ -43,7 +43,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){ $client_website = htmlentities($row['client_website']); $client_currency_code = htmlentities($row['client_currency_code']); $client_net_terms = htmlentities($row['client_net_terms']); - if($client_net_terms == 0){ + if ($client_net_terms == 0) { $client_net_terms = $config_default_net_terms; } $company_id = $row['company_id']; @@ -55,7 +55,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){ $company_phone = formatPhoneNumber($row['company_phone']); $company_email = htmlentities($row['company_email']); $company_logo = htmlentities($row['company_logo']); - if(!empty($company_logo)){ + if (!empty($company_logo)) { $company_logo_base64 = base64_encode(file_get_contents("uploads/settings/$company_id/$company_logo")); } $company_locale = htmlentities($row['company_locale']); @@ -70,7 +70,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){ $device = get_device(); //Update status to Viewed only if invoice_status = "Sent" - if($quote_status == 'Sent'){ + if ($quote_status == 'Sent') { mysqli_query($mysqli,"UPDATE quotes SET quote_status = 'Viewed' WHERE quote_id = $quote_id"); } @@ -88,7 +88,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
    Accept Decline @@ -170,7 +170,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
    - +
    @@ -223,13 +223,13 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
    - 0){ ?> + 0) { ?> - 0){ ?> + 0) { ?> @@ -266,7 +266,7 @@ var docDefinition = { // Header { columns: [ - + { image: , width: 120 @@ -387,7 +387,7 @@ var docDefinition = { $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_id ASC"); - while($row = mysqli_fetch_array($sql_invoice_items)){ + while ($row = mysqli_fetch_array($sql_invoice_items)) { $item_name = $row['item_name']; $item_description = $row['item_description']; $item_quantity = $row['item_quantity']; diff --git a/inc_alert_feedback.php b/inc_alert_feedback.php index 51865585..b3a3d0b0 100644 --- a/inc_alert_feedback.php +++ b/inc_alert_feedback.php @@ -1,8 +1,8 @@ @@ -17,7 +17,7 @@ if(!empty($_SESSION['alert_message'])){ } //Set Records Per Page -if(empty($_SESSION['records_per_page'])){ +if (empty($_SESSION['records_per_page'])) { $_SESSION['records_per_page'] = 10; } diff --git a/inc_all_client.php b/inc_all_client.php index 02a5c046..8ffd2617 100644 --- a/inc_all_client.php +++ b/inc_all_client.php @@ -10,7 +10,7 @@ include("top_nav.php");

    Nothing to see here

    "; }else{ @@ -33,7 +33,7 @@ if(isset($_GET['client_id'])){ $client_referral = htmlentities($row['client_referral']); $client_currency_code = htmlentities($row['client_currency_code']); $client_net_terms = $row['client_net_terms']; - if($client_net_terms == 0){ + if ($client_net_terms == 0) { $client_net_terms = $config_default_net_terms; } $client_notes = htmlentities($row['client_notes']); @@ -61,13 +61,13 @@ if(isset($_GET['client_id'])){ $client_tag_name_display_array = array(); $client_tag_id_array = array(); $sql_client_tags = mysqli_query($mysqli,"SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_tags.client_id = $client_id"); - while($row = mysqli_fetch_array($sql_client_tags)){ + while ($row = mysqli_fetch_array($sql_client_tags)) { $client_tag_id = $row['tag_id']; $client_tag_name = htmlentities($row['tag_name']); $client_tag_color = htmlentities($row['tag_color']); $client_tag_icon = htmlentities($row['tag_icon']); - if(empty($client_tag_icon)){ + if (empty($client_tag_icon)) { $client_tag_icon = "tag"; } diff --git a/inc_client_top_head.php b/inc_client_top_head.php index 5582e69e..e45779a0 100644 --- a/inc_client_top_head.php +++ b/inc_client_top_head.php @@ -11,14 +11,14 @@ $location_phone = formatPhoneNumber($location_phone);

    - + " target="_blank">

    @@ -26,7 +26,7 @@ $location_phone = formatPhoneNumber($location_phone); } ?>
    @@ -34,7 +34,7 @@ $location_phone = formatPhoneNumber($location_phone); } ?>

    Contact


    @@ -52,7 +52,7 @@ $location_phone = formatPhoneNumber($location_phone); } ?>
    @@ -60,11 +60,11 @@ $location_phone = formatPhoneNumber($location_phone); } ?> x
    - +

    Billing

    Paid
    -
    Balance
    float-right">
    +
    Balance
    float-right">
    Monthly Recurring
    Net Terms
    Days
    - +

    Support

    Open Tickets
    - +
    - + Send Email
    @@ -141,7 +141,7 @@ if(isset($_GET['invoice_id'])){
    - + Add Payment
    @@ -159,11 +159,11 @@ if(isset($_GET['invoice_id'])){
    Print ');">Download PDF - + Send Email ">Guest URL - +
    Cancel @@ -255,7 +255,7 @@ if(isset($_GET['invoice_id'])){ $total_tax = 0; $sub_total = 0; - while($row = mysqli_fetch_array($sql_invoice_items)){ + while ($row = mysqli_fetch_array($sql_invoice_items)) { $item_id = $row['item_id']; $item_name = htmlentities($row['item_name']); $item_description = htmlentities($row['item_description']); @@ -305,7 +305,7 @@ if(isset($_GET['invoice_id'])){ Subtotal
    - 0){ ?> + 0) { ?> - 0){ ?> + 0) { ?> @@ -407,7 +407,7 @@ if(isset($_GET['invoice_id'])){ diff --git a/vendor_add_from_template_modal.php b/vendor_add_from_template_modal.php index d0d05a35..73f0ff34 100644 --- a/vendor_add_from_template_modal.php +++ b/vendor_add_from_template_modal.php @@ -9,7 +9,7 @@ - +
    @@ -23,7 +23,7 @@ - +
    diff --git a/vendor_template_add_modal.php b/vendor_template_add_modal.php index e4143a7f..b1ed5dfc 100644 --- a/vendor_template_add_modal.php +++ b/vendor_template_add_modal.php @@ -9,7 +9,7 @@
    - +
    diff --git a/vendors.php b/vendors.php index da0150ed..78ece492 100644 --- a/vendors.php +++ b/vendors.php @@ -1,10 +1,10 @@
    - +
    @@ -65,7 +65,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    -
    " id="advancedFilter"> +
    " id="advancedFilter">
    @@ -85,7 +85,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    Date Vendor
    Subtotal
    Tax
    Paid
    ( Days Late)
    (Due in Days)
    Subtotal
    Discount
    Tax
    Tax
    Paid
    - "> + "> @@ -96,18 +96,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    @@ -140,7 +140,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    Vendor Description

    @@ -150,15 +150,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); } ?> - +