From 98f9083bcb8cb47e579c64712f1656e8750edb7d Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 11 Jan 2025 14:47:32 -0500 Subject: [PATCH] Structure rework: Moved most php files that are included to /includes renamed pagination.php to filter_footer.php, updated all file to reference new filter_footer and includes --- accounts.php | 6 +++--- admin_api.php | 6 +++--- admin_app_log.php | 6 +++--- admin_audit_log.php | 6 +++--- admin_backup.php | 4 ++-- admin_bulk_mail.php | 4 ++-- admin_category.php | 6 +++--- admin_custom_link.php | 6 +++--- admin_debug.php | 4 ++-- admin_document_template.php | 2 +- admin_document_template_details.php | 4 ++-- admin_legacy_debug.php | 4 ++-- admin_mail_queue.php | 6 +++--- admin_mail_queue_message_view.php | 4 ++-- admin_project_template.php | 6 +++--- admin_project_template_details.php | 4 ++-- admin_role.php | 6 +++--- admin_settings_ai.php | 4 ++-- admin_settings_company.php | 4 ++-- admin_settings_custom_fields.php | 6 +++--- admin_settings_default.php | 4 ++-- admin_settings_integration.php | 4 ++-- admin_settings_invoice.php | 4 ++-- admin_settings_localization.php | 4 ++-- admin_settings_mail.php | 4 ++-- admin_settings_maintenance.php | 4 ++-- admin_settings_module.php | 4 ++-- admin_settings_notification.php | 4 ++-- admin_settings_online_payment.php | 4 ++-- admin_settings_project.php | 4 ++-- admin_settings_quote.php | 4 ++-- admin_settings_security.php | 4 ++-- admin_settings_telemetry.php | 4 ++-- admin_settings_theme.php | 4 ++-- admin_settings_ticket.php | 4 ++-- admin_software_template.php | 6 +++--- admin_tag.php | 6 +++--- admin_tax.php | 4 ++-- admin_ticket_status.php | 6 +++--- admin_ticket_template.php | 6 +++--- admin_ticket_template_details.php | 4 ++-- admin_update.php | 4 ++-- admin_user.php | 6 +++--- admin_vendor_template.php | 6 +++--- blank.php | 4 ++-- budget.php | 4 ++-- budget_edit.php | 4 ++-- calendar_events.php | 4 ++-- client_asset_details.php | 4 ++-- client_assets.php | 6 +++--- client_certificates.php | 6 +++--- client_contact_details.php | 4 ++-- client_contacts.php | 6 +++--- client_document_details.php | 4 ++-- client_documents.php | 6 +++--- client_domains.php | 6 +++--- client_events.php | 2 +- client_files.php | 6 +++--- client_invoices.php | 6 +++--- client_locations.php | 6 +++--- client_logins.php | 6 +++--- client_networks.php | 6 +++--- client_overview.php | 4 ++-- client_payments.php | 6 +++--- client_quotes.php | 6 +++--- client_racks.php | 4 ++-- client_recurring_invoices.php | 6 +++--- client_recurring_tickets.php | 4 ++-- client_services.php | 4 ++-- client_software.php | 6 +++--- client_tickets.php | 6 +++--- client_trips.php | 6 +++--- client_vendors.php | 6 +++--- clients.php | 6 +++--- dashboard.php | 4 ++-- expenses.php | 6 +++--- force_mfa.php | 2 +- global_search.php | 4 ++-- admin_side_nav.php => includes/admin_side_nav.php | 0 client_side_nav.php => includes/client_side_nav.php | 0 pagination.php => includes/filter_footer.php | 0 filter_header.php => includes/filter_header.php | 0 footer.php => includes/footer.php | 2 +- header.php => includes/header.php | 0 inc_alert_feedback.php => includes/inc_alert_feedback.php | 0 inc_all.php => includes/inc_all.php | 0 inc_all_admin.php => includes/inc_all_admin.php | 0 inc_all_client.php => includes/inc_all_client.php | 0 inc_all_reports.php => includes/inc_all_reports.php | 0 inc_all_user.php => includes/inc_all_user.php | 0 .../inc_client_top_head.php | 0 inc_confirm_modal.php => includes/inc_confirm_modal.php | 0 inc_debug.php => includes/inc_debug.php | 0 inc_wrapper.php => includes/inc_wrapper.php | 0 reports_side_nav.php => includes/reports_side_nav.php | 0 side_nav.php => includes/side_nav.php | 0 top_nav.php => includes/top_nav.php | 0 user_side_nav.php => includes/user_side_nav.php | 0 invoice.php | 8 ++++---- invoices.php | 6 +++--- login.php | 4 ++-- notifications.php | 4 ++-- notifications_dismissed.php | 6 +++--- payments.php | 6 +++--- {dist => plugins/adminlte}/css/adminlte.min.css | 0 {dist => plugins/adminlte}/js/.eslintrc.json | 0 {dist => plugins/adminlte}/js/adminlte.min.js | 0 products.php | 6 +++--- project_details.php | 4 ++-- projects.php | 6 +++--- quote.php | 8 ++++---- quotes.php | 6 +++--- recurring_expenses.php | 6 +++--- recurring_invoice.php | 6 +++--- recurring_invoices.php | 6 +++--- recurring_tickets.php | 4 ++-- report_assets.php | 6 +++--- report_budget.php | 4 ++-- report_clients_with_balance.php | 4 ++-- report_domains.php | 6 +++--- report_expense_by_vendor.php | 4 ++-- report_expense_summary.php | 4 ++-- report_income_by_client.php | 4 ++-- report_income_summary.php | 4 ++-- report_password_rotation.php | 4 ++-- report_profit_loss.php | 4 ++-- report_recurring_by_client.php | 4 ++-- report_tax_summary.php | 4 ++-- report_ticket_by_client.php | 4 ++-- report_ticket_summary.php | 4 ++-- report_tickets_unbilled.php | 4 ++-- revenues.php | 6 +++--- temp_bulk_close_bugfix.php | 4 ++-- ticket.php | 6 +++--- tickets.php | 6 +++--- transfers.php | 6 +++--- trips.php | 6 +++--- user_activity.php | 4 ++-- user_details.php | 4 ++-- user_preferences.php | 4 ++-- user_security.php | 4 ++-- vendor_details.php | 6 +++--- vendors.php | 6 +++--- 143 files changed, 295 insertions(+), 295 deletions(-) rename admin_side_nav.php => includes/admin_side_nav.php (100%) rename client_side_nav.php => includes/client_side_nav.php (100%) rename pagination.php => includes/filter_footer.php (100%) rename filter_header.php => includes/filter_header.php (100%) rename footer.php => includes/footer.php (96%) rename header.php => includes/header.php (100%) rename inc_alert_feedback.php => includes/inc_alert_feedback.php (100%) rename inc_all.php => includes/inc_all.php (100%) rename inc_all_admin.php => includes/inc_all_admin.php (100%) rename inc_all_client.php => includes/inc_all_client.php (100%) rename inc_all_reports.php => includes/inc_all_reports.php (100%) rename inc_all_user.php => includes/inc_all_user.php (100%) rename inc_client_top_head.php => includes/inc_client_top_head.php (100%) rename inc_confirm_modal.php => includes/inc_confirm_modal.php (100%) rename inc_debug.php => includes/inc_debug.php (100%) rename inc_wrapper.php => includes/inc_wrapper.php (100%) rename reports_side_nav.php => includes/reports_side_nav.php (100%) rename side_nav.php => includes/side_nav.php (100%) rename top_nav.php => includes/top_nav.php (100%) rename user_side_nav.php => includes/user_side_nav.php (100%) rename {dist => plugins/adminlte}/css/adminlte.min.css (100%) rename {dist => plugins/adminlte}/js/.eslintrc.json (100%) rename {dist => plugins/adminlte}/js/adminlte.min.js (100%) diff --git a/accounts.php b/accounts.php index f23a0f7ee..0488c6244 100644 --- a/accounts.php +++ b/accounts.php @@ -4,7 +4,7 @@ $sort = "account_name"; $order = "ASC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_financial'); @@ -116,11 +116,11 @@ - + - @@ -176,5 +176,5 @@ - -
@@ -34,5 +34,5 @@
Archived - @@ -194,4 +194,4 @@ class="fas fa-fw fa-archive mr-2">Archived - @@ -149,5 +149,5 @@ - + - @@ -146,4 +146,4 @@ diff --git a/admin_role.php b/admin_role.php index 800b58cc4..62086cc28 100644 --- a/admin_role.php +++ b/admin_role.php @@ -4,7 +4,7 @@ $sort = "user_role_is_admin"; $order = "DESC"; -require_once "inc_all_admin.php"; +require_once "includes/inc_all_admin.php"; //Rebuild URL @@ -134,7 +134,7 @@ - @@ -143,5 +143,5 @@ require_once "admin_role_add_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/admin_settings_ai.php b/admin_settings_ai.php index 91eba5394..894859b8b 100644 --- a/admin_settings_ai.php +++ b/admin_settings_ai.php @@ -1,6 +1,6 @@
@@ -73,5 +73,5 @@
- @@ -120,5 +120,5 @@
@@ -249,4 +249,4 @@
@@ -39,5 +39,5 @@
-
@@ -102,5 +102,5 @@
@@ -327,5 +327,5 @@ -
@@ -78,5 +78,5 @@
@@ -193,4 +193,4 @@
@@ -151,5 +151,5 @@
@@ -41,4 +41,4 @@
@@ -54,5 +54,5 @@
@@ -62,5 +62,5 @@
@@ -38,5 +38,5 @@
@@ -63,5 +63,5 @@
@@ -82,5 +82,5 @@
- @@ -136,5 +136,5 @@ - @@ -130,5 +130,5 @@ - @@ -131,5 +131,5 @@ - - @@ -239,5 +239,5 @@ function generatePassword() { require_once "admin_user_all_reset_password_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/admin_vendor_template.php b/admin_vendor_template.php index 02694440c..f75cd9fbd 100644 --- a/admin_vendor_template.php +++ b/admin_vendor_template.php @@ -4,7 +4,7 @@ $sort = "vendor_name"; $order = "ASC"; -require_once "inc_all_admin.php"; +require_once "includes/inc_all_admin.php"; //Rebuild URL @@ -164,7 +164,7 @@ - @@ -172,5 +172,5 @@ +
    @@ -52,4 +52,4 @@ - diff --git a/budget_edit.php b/budget_edit.php index 76051bd07..c4b09abce 100644 --- a/budget_edit.php +++ b/budget_edit.php @@ -1,6 +1,6 @@ diff --git a/calendar_events.php b/calendar_events.php index 1b7ee7efc..1904f37af 100644 --- a/calendar_events.php +++ b/calendar_events.php @@ -1,6 +1,6 @@ - diff --git a/client_asset_details.php b/client_asset_details.php index 37f7be3ca..6c7fc4eca 100644 --- a/client_asset_details.php +++ b/client_asset_details.php @@ -1,6 +1,6 @@ - + @@ -627,7 +627,7 @@ class="btn btn- diff --git a/client_certificates.php b/client_certificates.php index c606fdf04..0696b5324 100644 --- a/client_certificates.php +++ b/client_certificates.php @@ -4,7 +4,7 @@ $sort = "certificate_name"; $order = "ASC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; // Perms enforceUserPermission('module_support'); @@ -200,7 +200,7 @@ - @@ -218,5 +218,5 @@ - diff --git a/client_contact_details.php b/client_contact_details.php index 595892cef..36e970420 100644 --- a/client_contact_details.php +++ b/client_contact_details.php @@ -1,6 +1,6 @@ - @@ -490,4 +490,4 @@ function(data) { require_once "modals/client_contact_export_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/client_document_details.php b/client_document_details.php index 89b96128d..e827241df 100644 --- a/client_document_details.php +++ b/client_document_details.php @@ -1,6 +1,6 @@ diff --git a/client_documents.php b/client_documents.php index a017d4ab4..12becd84e 100644 --- a/client_documents.php +++ b/client_documents.php @@ -4,7 +4,7 @@ $sort = "document_name"; $order = "ASC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; // Perms enforceUserPermission('module_support'); @@ -462,7 +462,7 @@ function display_folders($parent_folder_id, $client_id, $indent = 0) { - @@ -478,4 +478,4 @@ function display_folders($parent_folder_id, $client_id, $indent = 0) { require_once "client_document_add_from_template_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/client_domains.php b/client_domains.php index 299ec05c7..bf6bbde9b 100644 --- a/client_domains.php +++ b/client_domains.php @@ -4,7 +4,7 @@ $sort = "domain_name"; $order = "ASC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; // Perms enforceUserPermission('module_support'); @@ -255,7 +255,7 @@ class="btn btn- - @@ -271,5 +271,5 @@ class="btn btn- - - @@ -640,4 +640,4 @@ function prevFile() { require_once "client_file_delete_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/client_invoices.php b/client_invoices.php index 7685317e0..11624313f 100644 --- a/client_invoices.php +++ b/client_invoices.php @@ -4,7 +4,7 @@ $sort = "invoice_number"; $order = "DESC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; // Perms enforceUserPermission('module_sales'); @@ -213,7 +213,7 @@ - @@ -225,4 +225,4 @@ require_once "client_invoice_export_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/client_locations.php b/client_locations.php index 2c7f125d7..97e8149b5 100644 --- a/client_locations.php +++ b/client_locations.php @@ -4,7 +4,7 @@ $sort = "location_name"; $order = "ASC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; // Tags Filter if (isset($_GET['tags']) && is_array($_GET['tags']) && !empty($_GET['tags'])) { @@ -309,7 +309,7 @@ class="btn btn- - @@ -324,5 +324,5 @@ class="btn btn- - @@ -429,4 +429,4 @@ class="btn btn- - @@ -244,4 +244,4 @@ - @@ -152,5 +152,5 @@ - @@ -208,5 +208,5 @@ require_once "client_quote_export_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/client_racks.php b/client_racks.php index f81407db9..41827f48c 100644 --- a/client_racks.php +++ b/client_racks.php @@ -4,7 +4,7 @@ $sort = "rack_name"; $order = "ASC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; // Perms enforceUserPermission('module_support'); @@ -242,5 +242,5 @@ class="btn btn- diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php index 19e4e6688..281158ee3 100644 --- a/client_recurring_invoices.php +++ b/client_recurring_invoices.php @@ -4,7 +4,7 @@ $sort = "recurring_last_sent"; $order = "DESC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; // Perms enforceUserPermission('module_sales'); @@ -211,7 +211,7 @@ - @@ -221,5 +221,5 @@ require_once "client_recurring_export_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/client_recurring_tickets.php b/client_recurring_tickets.php index 1cdd127c9..88d608993 100644 --- a/client_recurring_tickets.php +++ b/client_recurring_tickets.php @@ -4,7 +4,7 @@ $sort = "scheduled_ticket_subject"; $order = "ASC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; // Perms enforceUserPermission('module_support'); @@ -180,5 +180,5 @@ require_once "recurring_ticket_edit_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/client_services.php b/client_services.php index 8026b3896..2ea4018c4 100644 --- a/client_services.php +++ b/client_services.php @@ -4,7 +4,7 @@ $sort = "service_name"; $order = "ASC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; // Perms enforceUserPermission('module_support'); @@ -218,5 +218,5 @@ - @@ -236,4 +236,4 @@ class="btn btn- - + @@ -344,5 +344,5 @@ require_once "client_ticket_export_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/client_trips.php b/client_trips.php index 6ff02c3f3..f45177d36 100644 --- a/client_trips.php +++ b/client_trips.php @@ -4,7 +4,7 @@ $sort = "trip_date"; $order = "DESC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; //Rebuild URL @@ -172,7 +172,7 @@ - @@ -182,5 +182,5 @@ require_once "client_trip_export_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/client_vendors.php b/client_vendors.php index 20268f8a2..2b2862826 100644 --- a/client_vendors.php +++ b/client_vendors.php @@ -4,7 +4,7 @@ $sort = "vendor_name"; $order = "ASC"; -require_once "inc_all_client.php"; +require_once "includes/inc_all_client.php"; // Perms enforceUserPermission('module_client'); @@ -259,7 +259,7 @@ class="btn btn- - @@ -273,5 +273,5 @@ class="btn btn- - @@ -490,5 +490,5 @@ class="collapse mt-3 require_once "client_export_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/dashboard.php b/dashboard.php index 20a9d4cde..79d89916c 100644 --- a/dashboard.php +++ b/dashboard.php @@ -1,5 +1,5 @@ - + diff --git a/expenses.php b/expenses.php index e3c7d7ccc..0db8b257a 100644 --- a/expenses.php +++ b/expenses.php @@ -4,7 +4,7 @@ $sort = "expense_date"; $order = "DESC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_financial'); @@ -365,7 +365,7 @@ - @@ -376,4 +376,4 @@ require_once "expense_add_modal.php"; require_once "expense_export_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/force_mfa.php b/force_mfa.php index 05e6d1f2d..7a2584572 100644 --- a/force_mfa.php +++ b/force_mfa.php @@ -70,5 +70,5 @@ diff --git a/admin_side_nav.php b/includes/admin_side_nav.php similarity index 100% rename from admin_side_nav.php rename to includes/admin_side_nav.php diff --git a/client_side_nav.php b/includes/client_side_nav.php similarity index 100% rename from client_side_nav.php rename to includes/client_side_nav.php diff --git a/pagination.php b/includes/filter_footer.php similarity index 100% rename from pagination.php rename to includes/filter_footer.php diff --git a/filter_header.php b/includes/filter_header.php similarity index 100% rename from filter_header.php rename to includes/filter_header.php diff --git a/footer.php b/includes/footer.php similarity index 96% rename from footer.php rename to includes/footer.php index 67e6cdb91..949d3001c 100644 --- a/footer.php +++ b/includes/footer.php @@ -33,7 +33,7 @@ - + diff --git a/header.php b/includes/header.php similarity index 100% rename from header.php rename to includes/header.php diff --git a/inc_alert_feedback.php b/includes/inc_alert_feedback.php similarity index 100% rename from inc_alert_feedback.php rename to includes/inc_alert_feedback.php diff --git a/inc_all.php b/includes/inc_all.php similarity index 100% rename from inc_all.php rename to includes/inc_all.php diff --git a/inc_all_admin.php b/includes/inc_all_admin.php similarity index 100% rename from inc_all_admin.php rename to includes/inc_all_admin.php diff --git a/inc_all_client.php b/includes/inc_all_client.php similarity index 100% rename from inc_all_client.php rename to includes/inc_all_client.php diff --git a/inc_all_reports.php b/includes/inc_all_reports.php similarity index 100% rename from inc_all_reports.php rename to includes/inc_all_reports.php diff --git a/inc_all_user.php b/includes/inc_all_user.php similarity index 100% rename from inc_all_user.php rename to includes/inc_all_user.php diff --git a/inc_client_top_head.php b/includes/inc_client_top_head.php similarity index 100% rename from inc_client_top_head.php rename to includes/inc_client_top_head.php diff --git a/inc_confirm_modal.php b/includes/inc_confirm_modal.php similarity index 100% rename from inc_confirm_modal.php rename to includes/inc_confirm_modal.php diff --git a/inc_debug.php b/includes/inc_debug.php similarity index 100% rename from inc_debug.php rename to includes/inc_debug.php diff --git a/inc_wrapper.php b/includes/inc_wrapper.php similarity index 100% rename from inc_wrapper.php rename to includes/inc_wrapper.php diff --git a/reports_side_nav.php b/includes/reports_side_nav.php similarity index 100% rename from reports_side_nav.php rename to includes/reports_side_nav.php diff --git a/side_nav.php b/includes/side_nav.php similarity index 100% rename from side_nav.php rename to includes/side_nav.php diff --git a/top_nav.php b/includes/top_nav.php similarity index 100% rename from top_nav.php rename to includes/top_nav.php diff --git a/user_side_nav.php b/includes/user_side_nav.php similarity index 100% rename from user_side_nav.php rename to includes/user_side_nav.php diff --git a/invoice.php b/invoice.php index 108fce996..deef2fbbc 100644 --- a/invoice.php +++ b/invoice.php @@ -2,9 +2,9 @@ // If client_id is in URI then show client Side Bar and client header if (isset($_GET['client_id'])) { - require_once "inc_all_client.php"; + require_once "includes/inc_all_client.php"; } else { - require_once "inc_all.php"; + require_once "includes/inc_all.php"; } if (isset($_GET['invoice_id'])) { @@ -22,7 +22,7 @@ if (mysqli_num_rows($sql) == 0) { echo '

    Nothing to see here

    '; - require_once "footer.php"; + require_once "includes/footer.php"; exit(); } @@ -674,7 +674,7 @@ } -require_once "footer.php"; +require_once "includes/footer.php"; ?> diff --git a/invoices.php b/invoices.php index de38e53e4..35881ab5c 100644 --- a/invoices.php +++ b/invoices.php @@ -4,7 +4,7 @@ $sort = "invoice_number"; $order = "DESC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_sales'); @@ -349,7 +349,7 @@ - @@ -358,5 +358,5 @@ require_once "invoice_add_modal.php"; require_once "invoice_export_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/login.php b/login.php index c4c105456..7b8024c15 100644 --- a/login.php +++ b/login.php @@ -315,7 +315,7 @@ - + @@ -401,7 +401,7 @@ - + diff --git a/notifications.php b/notifications.php index ab9806e88..af75852c0 100644 --- a/notifications.php +++ b/notifications.php @@ -1,6 +1,6 @@ - + - - diff --git a/dist/css/adminlte.min.css b/plugins/adminlte/css/adminlte.min.css similarity index 100% rename from dist/css/adminlte.min.css rename to plugins/adminlte/css/adminlte.min.css diff --git a/dist/js/.eslintrc.json b/plugins/adminlte/js/.eslintrc.json similarity index 100% rename from dist/js/.eslintrc.json rename to plugins/adminlte/js/.eslintrc.json diff --git a/dist/js/adminlte.min.js b/plugins/adminlte/js/adminlte.min.js similarity index 100% rename from dist/js/adminlte.min.js rename to plugins/adminlte/js/adminlte.min.js diff --git a/products.php b/products.php index 8da75d9fe..00e1aba64 100644 --- a/products.php +++ b/products.php @@ -4,7 +4,7 @@ $sort = "product_name"; $order = "ASC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_sales'); @@ -259,7 +259,7 @@ class="btn btn- - @@ -271,4 +271,4 @@ class="btn btn- diff --git a/projects.php b/projects.php index 1eab6989d..98fee8663 100644 --- a/projects.php +++ b/projects.php @@ -4,7 +4,7 @@ $sort = "project_name"; $order = "ASC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_support'); @@ -304,7 +304,7 @@ class="btn btn- - @@ -312,5 +312,5 @@ class="btn btn-Nothing to see here'; - require_once "footer.php"; + require_once "includes/footer.php"; exit(); } @@ -537,7 +537,7 @@ require_once "quote_note_modal.php"; } -require_once "footer.php"; +require_once "includes/footer.php"; ?> diff --git a/quotes.php b/quotes.php index c8388e403..b1eb8ec55 100644 --- a/quotes.php +++ b/quotes.php @@ -4,7 +4,7 @@ $sort = "quote_number"; $order = "DESC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_sales'); @@ -236,7 +236,7 @@ - @@ -247,5 +247,5 @@ require_once "quote_edit_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/recurring_expenses.php b/recurring_expenses.php index ca2a3d4b5..8b9049f85 100644 --- a/recurring_expenses.php +++ b/recurring_expenses.php @@ -4,7 +4,7 @@ $sort = "recurring_expense_next_date"; $order = "ASC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_financial'); @@ -221,7 +221,7 @@ - @@ -229,5 +229,5 @@ diff --git a/recurring_invoices.php b/recurring_invoices.php index 98ec7caae..cf84d56e4 100644 --- a/recurring_invoices.php +++ b/recurring_invoices.php @@ -4,7 +4,7 @@ $sort = "recurring_next_date"; $order = "ASC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_sales'); @@ -241,7 +241,7 @@ - @@ -250,4 +250,4 @@ require_once "recurring_invoice_add_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/recurring_tickets.php b/recurring_tickets.php index 73a19725c..c46709940 100644 --- a/recurring_tickets.php +++ b/recurring_tickets.php @@ -4,7 +4,7 @@ $sort = "scheduled_ticket_subject"; $order = "ASC"; -require_once "inc_all.php"; +require_once "includes/inc_all.php"; // Perms enforceUserPermission('module_support'); @@ -209,4 +209,4 @@ require_once "recurring_ticket_edit_modal.php"; -require_once "footer.php"; +require_once "includes/footer.php"; diff --git a/report_assets.php b/report_assets.php index 042e66070..e7fc9faee 100644 --- a/report_assets.php +++ b/report_assets.php @@ -4,7 +4,7 @@ $sort = "asset_name"; $order = "ASC"; -require_once "inc_all_reports.php"; +require_once "includes/inc_all_reports.php"; // Perms enforceUserPermission('module_support'); @@ -610,7 +610,7 @@ class="btn btn- - + @@ -618,5 +618,5 @@ class="btn btn- - \ No newline at end of file diff --git a/report_clients_with_balance.php b/report_clients_with_balance.php index 61f29d22f..5f75a4a45 100644 --- a/report_clients_with_balance.php +++ b/report_clients_with_balance.php @@ -1,6 +1,6 @@ - - - diff --git a/report_expense_summary.php b/report_expense_summary.php index 03332254c..9abe15a93 100644 --- a/report_expense_summary.php +++ b/report_expense_summary.php @@ -1,6 +1,6 @@ -