diff --git a/SECURITY.md b/SECURITY.md index bd36785f..a5e58297 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -20,7 +20,7 @@ ITFlow is in Beta. **Please do not report security vulnerabilities through public GitHub issues.** -If you have discovered a security issue, please report it to us in as much detail as possible so we can fix it. +If you have discovered a security issue, please report it to us in as much detail as possible, so we can fix it. You should expect to receive an initial acknowledgement within 72 hours. If you do not, please get in touch discretely via GitHub issues/Forum/Discord to ensure we received your e-mail. Security contact: 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/v1/assets/delete.php b/api/v1/assets/delete.php index 7228e027..3c0a7b72 100644 --- a/api/v1/assets/delete.php +++ b/api/v1/assets/delete.php @@ -25,4 +25,4 @@ if (!empty($asset_id)) { } // Output -require_once('../delete_output.php'); \ No newline at end of file +require_once('../delete_output.php'); diff --git a/api/v1/assets/read.php b/api/v1/assets/read.php index 3ff4f0a8..45a636cd 100644 --- a/api/v1/assets/read.php +++ b/api/v1/assets/read.php @@ -11,7 +11,7 @@ if (isset($_GET['asset_id'])) { // Asset query via type elseif (isset($_GET['asset_type'])) { - $type = mysqli_real_escape_string($mysqli,ucfirst($_GET['asset_type'])); + $type = mysqli_real_escape_string($mysqli, ucfirst($_GET['asset_type'])); $sql = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_type = '$type' AND asset_client_id LIKE '$client_id' AND company_id = '$company_id' ORDER BY asset_id LIMIT $limit OFFSET $offset"); } @@ -39,4 +39,4 @@ else { } // Output -require_once("../read_output.php"); \ No newline at end of file +require_once("../read_output.php"); 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); \ No newline at end of file + diff --git a/client_add_modal.php b/client_add_modal.php index cd5ab84b..fb2dcfd3 100644 --- a/client_add_modal.php +++ b/client_add_modal.php @@ -65,7 +65,7 @@ @@ -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..41d05cf6 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 e93c4ee0..350f62ec 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
- +
@@ -66,7 +66,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
- "> + "> @@ -79,7 +79,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
Software Type
0){ + if ($login_id > 0) { ?> @@ -173,7 +173,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..6b8fef45 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -1,15 +1,15 @@ -
    -
    Scheduled @@ -52,10 +51,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    - +
    - +
    @@ -73,24 +72,24 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    - "> + "> - - - + + + - + Never

    "; } else{ @@ -111,27 +110,27 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $ticket_updated_at_display = $ticket_updated_at; } $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 +141,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"; @@ -160,19 +159,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); - +
    NumberSubjectContactNumberSubjectContact Priority Status Assigned Last Response CreatedAction
    - +
    Edit - +
    Delete @@ -201,4 +200,4 @@ include("ticket_add_modal.php"); include("scheduled_ticket_add_modal.php"); ?> - \ No newline at end of file + 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()"));
    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_ticket_email_parser.php b/cron_ticket_email_parser.php index 7e5bb7ba..d0b6121b 100644 --- a/cron_ticket_email_parser.php +++ b/cron_ticket_email_parser.php @@ -203,4 +203,4 @@ if ($emails) { } -} \ No newline at end of file +} diff --git a/dashboard_financial.php b/dashboard_financial.php index ac9ae6f9..258b655b 100644 --- a/dashboard_financial.php +++ b/dashboard_financial.php @@ -39,7 +39,7 @@ $largest_income_month = 0; $sql_total_payments_to_invoices = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments_to_invoices FROM payments WHERE YEAR(payment_date) = $year AND company_id = $session_company_id"); $row = mysqli_fetch_array($sql_total_payments_to_invoices); $total_payments_to_invoices = $row['total_payments_to_invoices']; -//Do not grab transfer payment as these have an category_id of 0 +//Do not grab transfer payment as these have a category_id of 0 $sql_total_revenues = mysqli_query($mysqli,"SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE YEAR(revenue_date) = $year AND revenue_category_id > 0 AND company_id = $session_company_id"); $row = mysqli_fetch_array($sql_total_revenues); $total_revenues = $row['total_revenues']; @@ -65,7 +65,7 @@ $sql_invoice_totals_all_years = mysqli_query($mysqli,"SELECT SUM(invoice_amount) $row = mysqli_fetch_array($sql_invoice_totals_all_years); $invoice_totals_all_years = $row['invoice_totals_all_years']; -$receivables = $invoice_totals_all_years - $total_payments_to_invoices_all_years; +$receivables = $invoice_totals_all_years - $total_payments_to_invoices_all_years; $profit = $total_income - $total_expenses; @@ -112,16 +112,16 @@ $vendors_added = $row['vendors_added']; @@ -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; } - + ?> - + @@ -543,17 +543,17 @@ var myLineChart = new Chart(ctx, { $revenues_for_month = $row['revenue_amount_for_month']; $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,21 +580,21 @@ 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; } - + ?> - + ], - }, + }, { label: "Expense", lineTension: 0.3, @@ -608,24 +608,24 @@ var myLineChart = new Chart(ctx, { pointBorderWidth: 2, data: [ 0 AND expenses.company_id = $session_company_id"); $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; } - + ?> - + @@ -692,17 +692,17 @@ var myLineChart = new Chart(ctx, { $row = mysqli_fetch_array($sql_trips); $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,11 +752,11 @@ var myPieChart = new Chart(ctx, { labels: [ ], @@ -764,7 +764,7 @@ var myPieChart = new Chart(ctx, { data: [ ], backgroundColor: [ ], @@ -809,11 +809,11 @@ 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"); @@ -829,18 +829,18 @@ var myPieChart = new Chart(ctx, { $expense_amount_for_year = $row['expense_amount_for_year']; echo "$expense_amount_for_year,"; } - + ?> ], 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,11 +862,11 @@ var myPieChart = new Chart(ctx, { labels: [ ], @@ -874,7 +874,7 @@ var myPieChart = new Chart(ctx, { data: [ ], backgroundColor: [ ], diff --git a/database_updates.php b/database_updates.php index aa6561e1..29b046f7 100644 --- a/database_updates.php +++ b/database_updates.php @@ -475,6 +475,6 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ //} -}else{ +} else { // Up-to-date } \ No newline at end of file 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..53f5a269 100644 --- a/expense_copy_modal.php +++ b/expense_copy_modal.php @@ -9,8 +9,8 @@
    -
    - +
    +
    @@ -20,7 +20,7 @@ " required>
    - +
    @@ -30,11 +30,11 @@
    - +
    - +
    @@ -42,18 +42,18 @@
    - +
    @@ -80,29 +80,29 @@
    - +
    - +
    @@ -112,17 +112,17 @@
    @@ -134,18 +134,18 @@
    - + - +
    - + - +
    @@ -153,4 +153,4 @@
    - \ No newline at end of file + diff --git a/expense_edit_modal.php b/expense_edit_modal.php index 289a698e..271b4039 100644 --- a/expense_edit_modal.php +++ b/expense_edit_modal.php @@ -47,7 +47,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()"));
    - "> + "> @@ -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 8047e645..77daa64f 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]); @@ -68,14 +68,14 @@ 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'); } - + else{ - + $ip = $_SERVER["HTTP_CF_CONNECTING_IP"] ?? $_SERVER['REMOTE_ADDR']; } } @@ -131,7 +131,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']))) { @@ -159,7 +159,7 @@ function get_device(){ } if (strpos(strtolower(get_user_agent()),'opera mini') > 0) { $mobile_browser++; - //Check for tablets on opera mini alternative headers + //Check for tablets on Opera Mini alternative headers $stock_ua = strtolower(isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA'])?$_SERVER['HTTP_X_OPERAMINI_PHONE_UA']:(isset($_SERVER['HTTP_DEVICE_STOCK_UA'])?$_SERVER['HTTP_DEVICE_STOCK_UA']:'')); if (preg_match('/(tablet|ipad|playbook)|(android(?!.*mobile))/i', $stock_ua)) { $tablet_browser++; @@ -186,14 +186,13 @@ function truncate($text, $chars) { $text = $text." "; $text = substr($text,0,$chars); $text = substr($text,0,strrpos($text,' ')); - $text = $text."..."; - return $text; + return $text."..."; } 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); @@ -201,14 +200,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); @@ -226,7 +225,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)); @@ -236,9 +235,7 @@ function setupFirstUserSpecificKey($user_password, $site_encryption_master_key){ //Encrypt the master key with the users kdf'd hash and the IV $ciphertext = openssl_encrypt($site_encryption_master_key, 'aes-128-cbc', $user_password_kdhash, 0, $iv); - $user_encryption_ciphertext = $salt . $iv . $ciphertext; - - return $user_encryption_ciphertext; + return $salt . $iv . $ciphertext; } /* @@ -246,7 +243,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)); @@ -264,15 +261,13 @@ function encryptUserSpecificKey($user_password){ // Encrypt the master key with the users kdf'd hash and the IV $ciphertext = openssl_encrypt($site_encryption_master_key, 'aes-128-cbc', $user_password_kdhash, 0, $iv); - $user_encryption_ciphertext = $salt . $iv . $ciphertext; - - return $user_encryption_ciphertext; + return $salt . $iv . $ciphertext; } // 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); @@ -282,18 +277,17 @@ function decryptUserSpecificKey($user_encryption_ciphertext, $user_password){ $user_password_kdhash = hash_pbkdf2('sha256', $user_password, $salt, 100000, 16); //Use this hash to get the original/master key - $site_encryption_master_key = openssl_decrypt($ciphertext, 'aes-128-cbc', $user_password_kdhash, 0, $iv); - return $site_encryption_master_key; + return openssl_decrypt($ciphertext, 'aes-128-cbc', $user_password_kdhash, 0, $iv); } /* Generates what is probably best described as a session key (ephemeral-ish) - Allows us to store the master key on the server whilst the user is using the application, without prompting to type their password everytime they want to decrypt a credential -- Ciphertext/IV is stored on the server in the users session, encryption key is controlled/provided by the user as a cookie +- Ciphertext/IV is stored on the server in the users' session, encryption key is controlled/provided by the user as a cookie - 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)); @@ -306,7 +300,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, "/"); @@ -315,7 +309,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); @@ -330,13 +324,12 @@ function decryptLoginEntry($login_password_ciphertext){ $site_encryption_master_key = openssl_decrypt($user_encryption_session_ciphertext, 'aes-128-cbc', $user_encryption_session_key, 0, $user_encryption_session_iv); // Decrypt the login password using the master key - $login_password_cleartext = openssl_decrypt($login_ciphertext, 'aes-128-cbc', $site_encryption_master_key, 0, $login_iv); - return $login_password_cleartext; + return openssl_decrypt($login_ciphertext, 'aes-128-cbc', $site_encryption_master_key, 0, $login_iv); } // 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. @@ -350,15 +343,14 @@ function encryptLoginEntry($login_password_cleartext){ //Encrypt the website/asset login using the master key $ciphertext = openssl_encrypt($login_password_cleartext, 'aes-128-cbc', $site_encryption_master_key, 0, $iv); - $login_password_ciphertext = $iv . $ciphertext; - return $login_password_ciphertext; + return $iv . $ciphertext; } // 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'; } @@ -367,8 +359,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{ @@ -383,12 +375,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'] = ''; @@ -408,13 +400,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'] = ''; @@ -427,12 +419,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']); @@ -443,22 +435,20 @@ function getSSL($name){ return $certificate; } -function strto_AZaz09($string){ +function strto_AZaz09($string) { $string = ucwords(strtolower($string)); - + // Replace spaces with _ //$string = str_replace(' ', '_', $string); // Gets rid of non-alphanumerics - $strto_AZaz09 = preg_replace( '/[^A-Za-z0-9_]/', '', $string ); - - return $strto_AZaz09; + return preg_replace('/[^A-Za-z0-9_]/', '', $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{ @@ -476,8 +466,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"]); @@ -485,8 +475,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"]); @@ -494,8 +484,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"]); @@ -504,7 +494,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); @@ -524,7 +514,6 @@ function sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_ $mail->addAddress("$to_email", "$to_name"); // Add a recipient // Content - $mail->isHTML(true); // Set email format to HTML $mail->Subject = "$subject"; // Subject $mail->Body = "$body"; // Content @@ -539,10 +528,10 @@ function sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_ return true; } - catch(Exception $e){ - // If we couldn't send the message return the error so we can log it + 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/get_settings.php b/get_settings.php index 513c57fc..6efad592 100644 --- a/get_settings.php +++ b/get_settings.php @@ -112,7 +112,7 @@ $net_terms_array = array( '0'=>'On Reciept', '7'=>'7 Days', '14'=>'14 Days', - '30'=>'30 Days' + '30'=>'30 Days' ); $records_per_page_array = array('5','10','15','20','30','50','100'); @@ -927,4 +927,3 @@ $asset_status_array = array( 'Retired' ); -?> \ No newline at end of file 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..8a43f8a4 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,14 +13,14 @@ 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"); mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Accepted', history_description = 'Client accepted Quote!', history_created_at = NOW(), history_quote_id = $quote_id, company_id = $company_id"); $_SESSION['alert_message'] = "Quote Accepted"; - + header("Location: " . $_SERVER["HTTP_REFERER"]); }else{ echo "GTFO!!"; @@ -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"); @@ -44,12 +44,11 @@ if(isset($_GET['decline_quote'], $_GET['company_id'], $_GET['url_key'])){ $_SESSION['alert_type'] = "danger"; $_SESSION['alert_message'] = "Quote Declined"; - + header("Location: " . $_SERVER["HTTP_REFERER"]); }else{ echo "GTFO!!"; } - + } -?> \ No newline at end of file diff --git a/guest_view_invoice.php b/guest_view_invoice.php index d8283c8f..39e53b9f 100644 --- a/guest_view_invoice.php +++ b/guest_view_invoice.php @@ -2,7 +2,7 @@ Print ');"> Download Pay Online (Coming Soon) @@ -142,7 +142,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){ ">
    - +
    @@ -216,7 +216,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']); @@ -253,7 +253,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
    - +
    @@ -268,13 +268,13 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
    - 0){ ?> + 0) { ?> - 0){ ?> + 0) { ?> @@ -311,7 +311,7 @@ var docDefinition = { // Header { columns: [ - + { image: , width: 120 @@ -443,7 +443,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']; @@ -721,7 +721,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) { ?> @@ -743,7 +743,7 @@ var docDefinition = { - > + > @@ -781,7 +781,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) { ?> @@ -803,7 +803,7 @@ var docDefinition = { - > + > @@ -842,7 +842,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) { ?> @@ -864,7 +864,7 @@ var docDefinition = { - > + > @@ -892,14 +892,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 b75114b6..033fd9ee 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']); @@ -71,7 +71,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){ $browser = strip_tags(mysqli_real_escape_string($mysqli,get_web_browser($session_user_agent))); //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"); } @@ -89,7 +89,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
    Accept Decline @@ -171,7 +171,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
    - +
    @@ -224,13 +224,13 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
    - 0){ ?> + 0) { ?> - 0){ ?> + 0) { ?> @@ -267,7 +267,7 @@ var docDefinition = { // Header { columns: [ - + { image: , width: 120 @@ -388,7 +388,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.php b/inc_all.php index bf0679c4..4fd0a4f4 100644 --- a/inc_all.php +++ b/inc_all.php @@ -1,4 +1,4 @@ - \ No newline at end of file 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_all_reports.php b/inc_all_reports.php index 51429ed3..16dacb34 100644 --- a/inc_all_reports.php +++ b/inc_all_reports.php @@ -1,4 +1,4 @@ - \ No newline at end of file diff --git a/inc_all_settings.php b/inc_all_settings.php index ae21679b..32efb89e 100644 --- a/inc_all_settings.php +++ b/inc_all_settings.php @@ -1,4 +1,4 @@ - \ No newline at end of file diff --git a/inc_client_top_head.php b/inc_client_top_head.php index 8dd4ba2d..8f2a23bb 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'])){ - \ No newline at end of file + diff --git a/logs.php b/logs.php index 0e6a5f01..06c4783c 100644 --- a/logs.php +++ b/logs.php @@ -1,49 +1,49 @@
    - +
    @@ -83,21 +83,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    -
    " id="advancedFilter"> +
    " id="advancedFilter">
    @@ -119,7 +119,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
    - "> + "> @@ -134,7 +134,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $client_name"; diff --git a/notifications.php b/notifications.php index abe117d0..50ce7168 100644 --- a/notifications.php +++ b/notifications.php @@ -11,12 +11,12 @@ $sql = mysqli_query($mysqli,"SELECT * FROM notifications LEFT JOIN clients ON no

    Notifications

    - 0){ ?> Dismiss All + 0) { ?> Dismiss All Dismissed
    - 0){ ?> + 0) { ?>
    Timestamp User
    @@ -32,14 +32,14 @@ $sql = mysqli_query($mysqli,"SELECT * FROM notifications LEFT JOIN clients ON no $client_name"; diff --git a/notifications_dismissed.php b/notifications_dismissed.php index 2537bd68..e1597d8b 100644 --- a/notifications_dismissed.php +++ b/notifications_dismissed.php @@ -1,20 +1,20 @@
    - +
    @@ -54,7 +54,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    -
    " id="advancedFilter"> +
    " id="advancedFilter">
    @@ -73,21 +73,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    - "> + "> - - - - - - + + + + + + $client_name"; diff --git a/pagination.php b/pagination.php index 3ee940d9..dc20f7d8 100644 --- a/pagination.php +++ b/pagination.php @@ -21,12 +21,12 @@ if ($total_found_rows > 10) {
    @@ -39,21 +39,21 @@ if ($total_found_rows > 10) { 100)){ + if (($total_pages <= 1000) && ($total_pages > 100)) { $pages_split = 100; } - if(($total_pages <= 10000) && ($total_pages > 1000)){ + if (($total_pages <= 10000) && ($total_pages > 1000)) { $pages_split = 1000; } - if($p > 1){ + if ($p > 1) { $prev_class = ""; }else{ $prev_class = "disabled"; } - if($p <> $total_pages) { + if ($p <> $total_pages) { $next_class = ""; }else{ $next_class = "disabled"; @@ -62,14 +62,14 @@ if ($total_found_rows > 10) { $prev_page = $p - 1; $next_page = $p + 1; - if($p > 1){ + if ($p > 1) { echo "
  • Prev
    • "; } - while($i < $total_pages){ + while ($i < $total_pages) { $i++; - if(($i == 1) || (($p <= 3) && ($i <= 6)) || (($i > $total_pages - 6) && ($p > $total_pages - 3 )) || (is_int($i / $pages_split)) || (($p > 3) && ($i >= $p - 2) && ($i <= $p + 3)) || ($i == $total_pages)){ - if($p == $i ) { + if (($i == 1) || (($p <= 3) && ($i <= 6)) || (($i > $total_pages - 6) && ($p > $total_pages - 3 )) || (is_int($i / $pages_split)) || (($p > 3) && ($i >= $p - 2) && ($i <= $p + 3)) || ($i == $total_pages)) { + if ($p == $i ) { $page_class = "active"; }else{ $page_class = ""; @@ -78,7 +78,7 @@ if ($total_found_rows > 10) { } } - if($p <> $total_pages){ + if ($p <> $total_pages) { echo "
  • Next
    • "; } @@ -92,7 +92,7 @@ if ($total_found_rows > 10) { } -if($total_found_rows == 0){ +if ($total_found_rows == 0) { echo "

    No Results

    "; } diff --git a/pagination_head.php b/pagination_head.php index bbfb282a..881d1508 100644 --- a/pagination_head.php +++ b/pagination_head.php @@ -8,7 +8,7 @@ */ // 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']; @@ -19,8 +19,8 @@ if(isset($_GET['p'])){ } // Order -if(isset($_GET['o'])){ - if($_GET['o'] == 'ASC'){ +if (isset($_GET['o'])) { + if ($_GET['o'] == 'ASC') { $o = "ASC"; $disp = "DESC"; }else{ @@ -33,7 +33,7 @@ if(isset($_GET['o'])){ } // Search -if(isset($_GET['q'])){ +if (isset($_GET['q'])) { $q = strip_tags(mysqli_real_escape_string($mysqli,trim($_GET['q']))); }else{ $q = ""; diff --git a/payments.php b/payments.php index 0595198d..e9d6067b 100644 --- a/payments.php +++ b/payments.php @@ -1,49 +1,49 @@
    - +
    @@ -86,21 +86,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    -
    " id="advancedFilter"> +
    " id="advancedFilter">
    @@ -122,7 +122,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    Timestamp ">Type ">Notification ">Client ">Dismissed At ">Dismissed By ">Timestamp ">Type ">Notification ">Client ">Dismissed At ">Dismissed By ">
    - "> + "> @@ -137,7 +137,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); setTimeout(function() { window.location = \"login.php\"; },1000);"; -} \ No newline at end of file +} diff --git a/portal/tickets.php b/portal/tickets.php index 7a4c897b..7a0df97b 100644 --- a/portal/tickets.php +++ b/portal/tickets.php @@ -117,7 +117,7 @@ $total_tickets = $row['total_tickets']; All my tickets |
    diff --git a/product_add_modal.php b/product_add_modal.php index 95599d9d..13f0a5cf 100644 --- a/product_add_modal.php +++ b/product_add_modal.php @@ -31,7 +31,7 @@ @@ -72,7 +72,7 @@ '$product_created_at' OR category_archived_at IS NULL) AND company_id = $session_company_id"); - 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']); ?> - + '$product_created_at' OR tax_archived_at IS NULL) AND company_id = $session_company_id ORDER BY tax_name ASC"); - while($row = mysqli_fetch_array($taxes_sql)){ + while ($row = mysqli_fetch_array($taxes_sql)) { $tax_id_select = $row['tax_id']; $tax_name = htmlentities($row['tax_name']); $tax_percent = htmlentities($row['tax_percent']); ?> - +
    - +
    @@ -43,7 +43,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
    Payment Date Invoice Date
    - "> + "> @@ -55,11 +55,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $product_description"; diff --git a/quote.php b/quote.php index 08995eda..f20a8f38 100644 --- a/quote.php +++ b/quote.php @@ -2,7 +2,7 @@ 0){ - while($row = mysqli_fetch_array($products_sql)){ + if (mysqli_num_rows($products_sql) > 0) { + while ($row = mysqli_fetch_array($products_sql)) { $products[] = $row; } $json_products = json_encode($products); @@ -104,12 +104,12 @@ if(isset($_GET['quote_id'])){
    - +
    - + Send Email
    @@ -117,12 +117,12 @@ if(isset($_GET['quote_id'])){
    - + Accept Decline - + Invoice @@ -139,7 +139,7 @@ if(isset($_GET['quote_id'])){
    Print ');">Download PDF - + Send Email ">Guest URL @@ -219,7 +219,7 @@ if(isset($_GET['quote_id'])){ $total_tax = 0; $sub_total = 0; - while($row = mysqli_fetch_array($sql_items)){ + while ($row = mysqli_fetch_array($sql_items)) { $item_id = $row['item_id']; $item_name = htmlentities($row['item_name']); $item_description = htmlentities($row['item_description']); @@ -269,7 +269,7 @@ if(isset($_GET['quote_id'])){ Subtotal
    - 0){ ?> + 0) { ?> @@ -366,7 +366,7 @@ if(isset($_GET['quote_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()"));
    Name Category
    Tax
    - "> + "> @@ -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()")); } ?> - +