diff --git a/admin/includes/footer.php b/admin/includes/footer.php deleted file mode 100644 index 60235990..00000000 --- a/admin/includes/footer.php +++ /dev/null @@ -1,53 +0,0 @@ - - - -

ITFlow   ·   Docs   ·   Forum   ·   Services

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Total Execution Time: '.number_format((float) $execution_time, 10) .' seconds'; diff --git a/admin/includes/header.php b/admin/includes/header.php deleted file mode 100644 index 8a22fd82..00000000 --- a/admin/includes/header.php +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - <?php echo $session_company_name; ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"> -
diff --git a/admin/includes/inc_all_admin.php b/admin/includes/inc_all_admin.php index 53d050f9..fb600215 100644 --- a/admin/includes/inc_all_admin.php +++ b/admin/includes/inc_all_admin.php @@ -7,7 +7,7 @@ require_once "../includes/page_title.php"; if (!isset($session_is_admin) || !$session_is_admin) { exit(WORDING_ROLECHECK_FAILED . "
Tell your admin: Your role does not have admin access."); } -require_once "includes/header.php"; +require_once "../includes/header.php"; require_once "../includes/top_nav.php"; require_once "includes/side_nav.php"; require_once "../includes/inc_wrapper.php"; diff --git a/admin/includes/modal_footer.php b/admin/includes/modal_footer.php deleted file mode 100644 index 4bbe5766..00000000 --- a/admin/includes/modal_footer.php +++ /dev/null @@ -1,9 +0,0 @@ - - - - $content]); -?> \ No newline at end of file diff --git a/admin/includes/modal_header.php b/admin/includes/modal_header.php deleted file mode 100644 index 695f098a..00000000 --- a/admin/includes/modal_header.php +++ /dev/null @@ -1,13 +0,0 @@ - 'ID missing.']); -// exit; -//} diff --git a/includes/client_side_nav.php b/includes/client_side_nav.php deleted file mode 100644 index 6fc74f3b..00000000 --- a/includes/client_side_nav.php +++ /dev/null @@ -1,354 +0,0 @@ - - diff --git a/includes/db.php b/includes/db.php new file mode 100644 index 00000000..c22463ae --- /dev/null +++ b/includes/db.php @@ -0,0 +1,6 @@ + +if ($_SERVER['REQUEST_URI'] === '/admin') { ?>

ITFlow   ·   Docs   ·   Forum   ·   Services


@@ -22,24 +22,24 @@ if (str_contains(basename($_SERVER["PHP_SELF"]), "admin_")) { ?> - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + diff --git a/includes/header.php b/includes/header.php index 483084e1..9c46be30 100644 --- a/includes/header.php +++ b/includes/header.php @@ -6,6 +6,13 @@ header("X-Frame-Options: DENY"); +// Determine URI prepending logic (URI Routing maybe move to /includes/router.php) +if ($_SERVER['REQUEST_URI'] === '/user/reports') { + $prepend_uri = "../"; +} else { + $prepend_uri = ''; +} + ?> @@ -18,37 +25,33 @@ header("X-Frame-Options: DENY"); <?php echo $session_company_name; ?> - - - - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + accent- + ">
+ diff --git a/includes/inc_all_client.php b/includes/inc_all_client.php deleted file mode 100644 index 40cccea6..00000000 --- a/includes/inc_all_client.php +++ /dev/null @@ -1,316 +0,0 @@ -window.history.back();"; - exit(); - } - - $sql = mysqli_query($mysqli, "UPDATE clients SET client_accessed_at = NOW() WHERE client_id = $client_id"); - - $sql = mysqli_query( - $mysqli, - "SELECT * FROM clients - LEFT JOIN locations ON clients.client_id = locations.location_client_id AND location_primary = 1 - LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 - WHERE client_id = $client_id" - ); - - if (mysqli_num_rows($sql) == 0) { - require_once "header.php"; - - echo "

Nothing to see here

"; - } else { - - $row = mysqli_fetch_array($sql); - $client_name = nullable_htmlentities($row['client_name']); - $client_is_lead = intval($row['client_lead']); - $client_type = nullable_htmlentities($row['client_type']); - $client_website = nullable_htmlentities($row['client_website']); - $client_referral = nullable_htmlentities($row['client_referral']); - $client_currency_code = nullable_htmlentities($row['client_currency_code']); - $client_net_terms = intval($row['client_net_terms']); - if ($client_net_terms == 0) { - $client_net_terms = $config_default_net_terms; - } - $client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']); - $client_abbreviation = nullable_htmlentities($row['client_abbreviation']); - $client_rate = floatval($row['client_rate']); - $client_notes = nullable_htmlentities($row['client_notes']); - $client_created_at = nullable_htmlentities($row['client_created_at']); - $client_archived_at = nullable_htmlentities($row['client_archived_at']); - $contact_id = intval($row['contact_id']); - $contact_name = nullable_htmlentities($row['contact_name']); - $contact_title = nullable_htmlentities($row['contact_title']); - $contact_email = nullable_htmlentities($row['contact_email']); - $contact_phone_country_code = nullable_htmlentities($row['contact_phone_country_code']); - $contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code)); - $contact_extension = nullable_htmlentities($row['contact_extension']); - $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']); - $contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); - $contact_primary = intval($row['contact_primary']); - $location_id = intval($row['location_id']); - $location_name = nullable_htmlentities($row['location_name']); - $location_address = nullable_htmlentities($row['location_address']); - $location_city = nullable_htmlentities($row['location_city']); - $location_state = nullable_htmlentities($row['location_state']); - $location_zip = nullable_htmlentities($row['location_zip']); - $location_country = nullable_htmlentities($row['location_country']); - $location_phone_country_code = nullable_htmlentities($row['location_phone_country_code']); - $location_phone = nullable_htmlentities(formatPhoneNumber($row['location_phone'], $location_phone_country_code)); - $location_primary = intval($row['location_primary']); - - // Tab Title // No Sanitizing needed - $tab_title = $row['client_name']; - - // Client Tags - - $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_id = $client_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_array($sql_client_tags)) { - - $client_tag_id = intval($row['tag_id']); - $client_tag_name = nullable_htmlentities($row['tag_name']); - $client_tag_color = nullable_htmlentities($row['tag_color']); - if (empty($client_tag_color)) { - $client_tag_color = "dark"; - } - $client_tag_icon = nullable_htmlentities($row['tag_icon']); - if (empty($client_tag_icon)) { - $client_tag_icon = "tag"; - } - - $client_tag_id_array[] = $client_tag_id; - $client_tag_name_display_array[] = "$client_tag_name"; - } - $client_tags_display = implode('', $client_tag_name_display_array); - - //Add up all the payments for the invoice and get the total amount paid to the invoice - $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable'"); - $row = mysqli_fetch_array($sql_invoice_amounts); - - $invoice_amounts = floatval($row['invoice_amounts']); - - $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id"); - $row = mysqli_fetch_array($sql_amount_paid); - - $amount_paid = floatval($row['amount_paid']); - - $balance = $invoice_amounts - $amount_paid; - - //Get Monthly Recurring Total - $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $client_id"); - $row = mysqli_fetch_array($sql_recurring_monthly_total); - - $recurring_monthly_total = floatval($row['recurring_monthly_total']); - - //Get Yearly Recurring Total - $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $client_id"); - $row = mysqli_fetch_array($sql_recurring_yearly_total); - - $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12; - - $recurring_monthly = $recurring_monthly_total + $recurring_yearly_total; - - // Get Credit Balance - $sql_credit_balance = mysqli_query($mysqli, "SELECT SUM(credit_amount) AS credit_balance FROM credits WHERE credit_client_id = $client_id"); - $row = mysqli_fetch_array($sql_credit_balance); - - $credit_balance = floatval($row['credit_balance']); - - // Badge Counts - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id")); - $num_contacts = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('location_id') AS num FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id")); - $num_locations = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets WHERE asset_archived_at IS NULL AND asset_client_id = $client_id")); - $num_assets = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_closed_at IS NULL AND ticket_status != 4 AND ticket_client_id = $client_id")); - $num_active_tickets = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_closed_at IS NOT NULL AND ticket_client_id = $client_id")); - $num_closed_tickets = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_ticket_id') AS num FROM recurring_tickets WHERE recurring_ticket_client_id = $client_id")); - $num_recurring_tickets = $row['num']; - - // Active Project Count - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('project_id') AS num FROM projects WHERE project_archived_at IS NULL AND project_completed_at IS NULL AND project_client_id = $client_id")); - $num_active_projects = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('service_id') AS num FROM services WHERE service_client_id = $client_id")); - $num_services = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id")); - $num_vendors = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_archived_at IS NULL AND credential_client_id = $client_id")); - $num_credentials = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('network_id') AS num FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id")); - $num_networks = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('rack_id') AS num FROM racks WHERE rack_archived_at IS NULL AND rack_client_id = $client_id")); - $num_racks = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('domain_id') AS num FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id")); - $num_domains = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('certificate_id') AS num FROM certificates WHERE certificate_archived_at IS NULL AND certificate_client_id = $client_id")); - $num_certificates = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_archived_at IS NULL AND software_client_id = $client_id")); - $num_software = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE (invoice_status = 'Sent' OR invoice_status = 'Viewed' OR invoice_status = 'Partial') AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_open = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Draft' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_draft = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_sent = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Viewed' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_viewed = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Partial' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_partial = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Paid' AND invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices_paid = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_archived_at IS NULL AND invoice_client_id = $client_id")); - $num_invoices = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('quote_id') AS num FROM quotes WHERE quote_archived_at IS NULL AND quote_client_id = $client_id")); - $num_quotes = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_invoice_id') AS num FROM recurring_invoices WHERE recurring_invoice_archived_at IS NULL AND recurring_invoice_client_id = $client_id")); - $num_recurring_invoices = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('payment_id') AS num FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id")); - $num_payments = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files WHERE file_archived_at IS NULL AND file_client_id = $client_id")); - $num_files = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_archived_at IS NULL AND document_client_id = $client_id")); - $num_documents = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('event_id') AS num FROM calendar_events WHERE event_client_id = $client_id")); - $num_calendar_events = $row['num']; - - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('trip_id') AS num FROM trips WHERE trip_archived_at IS NULL AND trip_client_id = $client_id")); - $num_trips = $row['num']; - - // Expiring Items - - // Count Domains Expiring within 45 Days - $row = mysqli_fetch_assoc(mysqli_query( - $mysqli, - "SELECT COUNT('domain_id') AS num FROM domains - WHERE domain_client_id = $client_id - AND domain_expire IS NOT NULL - AND domain_expire < CURRENT_DATE + INTERVAL 45 DAY - AND domain_archived_at IS NULL" - )); - $num_domains_expiring_warning= intval($row['num']); - - // Count Domains Expired or within 7 days - $row = mysqli_fetch_assoc(mysqli_query( - $mysqli, - "SELECT COUNT('domain_id') AS num FROM domains - WHERE domain_client_id = $client_id - AND domain_expire IS NOT NULL - AND ( - domain_expire < CURRENT_DATE - OR domain_expire < CURRENT_DATE + INTERVAL 7 DAY - ) - AND domain_archived_at IS NULL" - )); - $num_domains_urgent = intval($row['num']); - - // Count Certificates Expiring within 7 Days - $row = mysqli_fetch_assoc(mysqli_query( - $mysqli, - "SELECT COUNT('certificate_id') AS num FROM certificates - WHERE certificate_client_id = $client_id - AND certificate_expire IS NOT NULL - AND certificate_expire < CURRENT_DATE + INTERVAL 7 DAY - AND certificate_archived_at IS NULL" - )); - $num_certificates_expiring = intval($row['num']); - - // Count Certificates Expired or within 7 days - $row = mysqli_fetch_assoc(mysqli_query( - $mysqli, - "SELECT COUNT('certificate_id') AS num FROM certificates - WHERE certificate_client_id = $client_id - AND certificate_expire IS NOT NULL - AND ( - certificate_expire < CURRENT_DATE - OR certificate_expire < CURRENT_DATE + INTERVAL 1 DAY - ) - AND certificate_archived_at IS NULL" - )); - $num_certificates_expired = intval($row['num']); - - // Count Software Expiring within 90 Days - $row = mysqli_fetch_assoc(mysqli_query( - $mysqli, - "SELECT COUNT('software_id') AS num FROM software - WHERE software_client_id = $client_id - AND software_expire IS NOT NULL - AND software_expire < CURRENT_DATE + INTERVAL 45 DAY - AND software_archived_at IS NULL" - )); - $num_software_expiring = intval($row['num']); - - // Count Software Expired or within 14 days - $row = mysqli_fetch_assoc(mysqli_query( - $mysqli, - "SELECT COUNT('software_id') AS num FROM software - WHERE software_client_id = $client_id - AND software_expire IS NOT NULL - AND ( - software_expire < CURRENT_DATE - OR software_expire < CURRENT_DATE + INTERVAL 7 DAY - ) - AND software_archived_at IS NULL" - )); - $num_software_expired = intval($row['num']); - - } -} - -require_once "header.php"; -require_once "top_nav.php"; -require_once "client_side_nav.php"; -require_once "inc_wrapper.php"; -require_once "inc_alert_feedback.php"; -require_once "inc_client_top_head.php"; -require_once "filter_header.php"; diff --git a/includes/inc_all_user.php b/includes/inc_all_user.php deleted file mode 100644 index bafda7b6..00000000 --- a/includes/inc_all_user.php +++ /dev/null @@ -1,12 +0,0 @@ -

Nothing to see here

"; } else { @@ -307,10 +307,10 @@ if (isset($_GET['client_id'])) { } } -require_once "header.php"; -require_once "top_nav.php"; -require_once "client_side_nav.php"; -require_once "inc_wrapper.php"; -require_once "inc_alert_feedback.php"; -require_once "inc_client_top_head.php"; -require_once "filter_header.php"; +require_once "../includes/header.php"; +require_once "../includes/top_nav.php"; +require_once "includes/side_nav.php"; +require_once "../includes/inc_wrapper.php"; +require_once "../includes/inc_alert_feedback.php"; +require_once "includes/inc_client_top_head.php"; +require_once "../includes/filter_header.php"; diff --git a/user/includes/inc_all_user.php b/user/includes/inc_all_user.php index bafda7b6..45d12dd3 100644 --- a/user/includes/inc_all_user.php +++ b/user/includes/inc_all_user.php @@ -1,12 +1,13 @@
- + diff --git a/user/modals/clients/client_download_pdf.php b/user/modals/client/client_download_pdf.php similarity index 100% rename from user/modals/clients/client_download_pdf.php rename to user/modals/client/client_download_pdf.php diff --git a/user/modals/clients/client_edit.php b/user/modals/client/client_edit.php similarity index 100% rename from user/modals/clients/client_edit.php rename to user/modals/client/client_edit.php diff --git a/user/modals/clients/client_export.php b/user/modals/client/client_export.php similarity index 100% rename from user/modals/clients/client_export.php rename to user/modals/client/client_export.php diff --git a/user/modals/clients/client_import.php b/user/modals/client/client_import.php similarity index 100% rename from user/modals/clients/client_import.php rename to user/modals/client/client_import.php diff --git a/user/reports/includes/footer.php b/user/reports/includes/footer.php deleted file mode 100644 index a5449dfa..00000000 --- a/user/reports/includes/footer.php +++ /dev/null @@ -1,53 +0,0 @@ - - - -

ITFlow   ·   Docs   ·   Forum   ·   Services

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Total Execution Time: '.number_format((float) $execution_time, 10) .' seconds'; diff --git a/user/reports/includes/header.php b/user/reports/includes/header.php deleted file mode 100644 index 76e42de5..00000000 --- a/user/reports/includes/header.php +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - <?php echo $session_company_name; ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"> -
diff --git a/user/reports/includes/inc_all_reports.php b/user/reports/includes/inc_all_reports.php index 1d9b14dc..23f50a66 100644 --- a/user/reports/includes/inc_all_reports.php +++ b/user/reports/includes/inc_all_reports.php @@ -6,7 +6,7 @@ require_once "../../includes/check_login.php"; require_once "../../includes/page_title.php"; // Reporting Perms enforceUserPermission('module_reporting'); -require_once "includes/header.php"; +require_once "../../includes/header.php"; require_once "../../includes/top_nav.php"; require_once "includes/side_nav.php"; require_once "../../includes/inc_wrapper.php"; diff --git a/user/vendors.php b/user/vendors.php index df2290fb..0a5e6e67 100644 --- a/user/vendors.php +++ b/user/vendors.php @@ -283,12 +283,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- - +