diff --git a/admin/document_template_details.php b/admin/document_template_details.php index 375837cb..fa6c3f51 100644 --- a/admin/document_template_details.php +++ b/admin/document_template_details.php @@ -4,7 +4,7 @@ require_once "includes/inc_all_admin.php"; //Initialize the HTML Purifier to prevent XSS -require "../plugins/htmlpurifier/HTMLPurifier.standalone.php"; +require "../libs/htmlpurifier/HTMLPurifier.standalone.php"; $purifier_config = HTMLPurifier_Config::createDefault(); $purifier_config->set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one diff --git a/admin/modals/mail_queue/mail_queue_message_view.php b/admin/modals/mail_queue/mail_queue_message_view.php index 5a5ce9a0..5f44bece 100644 --- a/admin/modals/mail_queue/mail_queue_message_view.php +++ b/admin/modals/mail_queue/mail_queue_message_view.php @@ -9,7 +9,7 @@ if (!isset($session_is_admin) || !$session_is_admin) { $email_id = intval($_GET['id']); //Initialize the HTML Purifier to prevent XSS -require "../../../plugins/htmlpurifier/HTMLPurifier.standalone.php"; +require "../../../libs/htmlpurifier/HTMLPurifier.standalone.php"; $purifier_config = HTMLPurifier_Config::createDefault(); $purifier_config->set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one diff --git a/admin/post/saved_payment_method.php b/admin/post/saved_payment_method.php index 7f2b7896..07c51e96 100644 --- a/admin/post/saved_payment_method.php +++ b/admin/post/saved_payment_method.php @@ -42,7 +42,7 @@ if (isset($_GET['delete_saved_payment'])) { try { // Initialize stripe - require_once '../plugins/stripe-php/init.php'; + require_once '../libs/stripe-php/init.php'; $stripe = new \Stripe\StripeClient($private_key); // Detach PM diff --git a/admin/post/settings_online_payment_clients.php b/admin/post/settings_online_payment_clients.php index 4350b07a..473c3a13 100644 --- a/admin/post/settings_online_payment_clients.php +++ b/admin/post/settings_online_payment_clients.php @@ -16,7 +16,7 @@ if (isset($_GET['stripe_remove_pm'])) { try { // Initialize stripe - require_once '../plugins/stripe-php/init.php'; + require_once '../libs/stripe-php/init.php'; $stripe = new \Stripe\StripeClient($config_stripe_secret); // Detach PM diff --git a/admin/project_template_details.php b/admin/project_template_details.php index 7e9b1e75..381d2410 100644 --- a/admin/project_template_details.php +++ b/admin/project_template_details.php @@ -212,7 +212,7 @@ if (isset($_GET['project_template_id'])) { - + - + - + + + + + + + - + + + + + - - + + SetCreator(PDF_CREATOR); diff --git a/agent/post/document.php b/agent/post/document.php index 1055fa0d..b0703075 100644 --- a/agent/post/document.php +++ b/agent/post/document.php @@ -703,7 +703,7 @@ if (isset($_GET['export_document'])) { enforceClientAccess(); // Include the TCPDF class - require_once('../plugins/TCPDF/tcpdf.php'); + require_once('../libs/TCPDF/tcpdf.php'); $pdf = new TCPDF(); diff --git a/agent/post/invoice.php b/agent/post/invoice.php index 08353410..946708d5 100644 --- a/agent/post/invoice.php +++ b/agent/post/invoice.php @@ -857,7 +857,7 @@ if (isset($_GET['export_invoice_pdf'])) { //Set Badge color based off of invoice status $invoice_badge_color = getInvoiceBadgeColor($invoice_status); - require_once("../plugins/TCPDF/tcpdf.php"); + require_once("../libs/TCPDF/tcpdf.php"); // Start TCPDF $pdf = new TCPDF('P', 'mm', 'A4', true, 'UTF-8', false); @@ -1042,7 +1042,7 @@ if (isset($_GET['export_invoice_packing_slip'])) { $company_website = nullable_htmlentities($row['company_website']); $company_logo = nullable_htmlentities($row['company_logo']); - require_once("../plugins/TCPDF/tcpdf.php"); + require_once("../libs/TCPDF/tcpdf.php"); // Start TCPDF $pdf = new TCPDF('P', 'mm', 'A4', true, 'UTF-8', false); diff --git a/agent/post/payment.php b/agent/post/payment.php index 1d4cd713..2c9fb422 100644 --- a/agent/post/payment.php +++ b/agent/post/payment.php @@ -396,7 +396,7 @@ if (isset($_POST['add_payment_stripe'])) { } // Initialize Stripe - require_once __DIR__ . '/../../plugins/stripe-php/init.php'; + require_once __DIR__ . '/../../libs/stripe-php/init.php'; $stripe = new \Stripe\StripeClient($private_key); $balance_to_pay = round($invoice_amount, 2); @@ -581,7 +581,7 @@ if (isset($_GET['add_payment_stripe'])) { } // Initialize Stripe - require_once __DIR__ . '/../plugins/stripe-php/init.php'; + require_once __DIR__ . '/../libs/stripe-php/init.php'; $stripe = new \Stripe\StripeClient($config_stripe_secret); $balance_to_pay = round($invoice_amount, 2); diff --git a/agent/post/quote.php b/agent/post/quote.php index 6d34d4a8..b5e23b3b 100644 --- a/agent/post/quote.php +++ b/agent/post/quote.php @@ -828,7 +828,7 @@ if (isset($_GET['export_quote_pdf'])) { $quote_badge_color = "secondary"; } - require_once("../plugins/TCPDF/tcpdf.php"); + require_once("../libs/TCPDF/tcpdf.php"); // Start TCPDF $pdf = new TCPDF('P', 'mm', 'A4', true, 'UTF-8', false); diff --git a/agent/quote.php b/agent/quote.php index 93339996..c97995c7 100644 --- a/agent/quote.php +++ b/agent/quote.php @@ -582,8 +582,8 @@ require_once "../includes/footer.php"; - - + + - + + + - + - + "; ?> - + diff --git a/agent/user/mfa_enforcement.php b/agent/user/mfa_enforcement.php index 5f930e6a..88946222 100644 --- a/agent/user/mfa_enforcement.php +++ b/agent/user/mfa_enforcement.php @@ -2,7 +2,7 @@ require_once "../../config.php"; require_once "../../functions.php"; require_once "../../includes/check_login.php"; -require_once '../../plugins/totp/totp.php'; //TOTP MFA Lib +require_once '../../libs/totp/totp.php'; //TOTP MFA Lib // Get Company Logo $sql = mysqli_query($mysqli, "SELECT company_logo FROM companies"); @@ -41,15 +41,15 @@ $data = "otpauth://totp/ITFlow:$session_email?secret=$token"; - + - - + + - - + + @@ -72,7 +72,7 @@ $data = "otpauth://totp/ITFlow:$session_email?secret=$token";
- +

@@ -100,10 +100,10 @@ $data = "otpauth://totp/ITFlow:$session_email?secret=$token"; - + - + + - + - + + - + - + diff --git a/client/post.php b/client/post.php index 9d8e0f6d..9fd1b8de 100644 --- a/client/post.php +++ b/client/post.php @@ -577,7 +577,7 @@ if (isset($_GET['add_payment_by_provider'])) { } // Initialize Stripe - require_once __DIR__ . '/../plugins/stripe-php/init.php'; + require_once __DIR__ . '/../libs/stripe-php/init.php'; $stripe = new \Stripe\StripeClient($private_key); $balance_to_pay = round($invoice_amount, 2); @@ -737,7 +737,7 @@ if (isset($_POST['create_stripe_customer'])) { if (!$existing_customer) { try { // Initialize Stripe - require_once '../plugins/stripe-php/init.php'; + require_once '../libs/stripe-php/init.php'; $stripe = new \Stripe\StripeClient($stripe_secret_key); // Create new customer in Stripe @@ -831,7 +831,7 @@ if (isset($_GET['create_stripe_checkout'])) { $return_url = "https://$config_base_url/client/post.php?stripe_save_card&session_id={CHECKOUT_SESSION_ID}"; try { - require_once '../plugins/stripe-php/init.php'; + require_once '../libs/stripe-php/init.php'; $stripe = new \Stripe\StripeClient($stripe_secret_key); // Create checkout session @@ -905,7 +905,7 @@ if (isset($_GET['stripe_save_card'])) { $checkout_session_id = sanitizeInput($_GET['session_id']); try { - require_once '../plugins/stripe-php/init.php'; + require_once '../libs/stripe-php/init.php'; $stripe = new \Stripe\StripeClient($stripe_secret_key); // Retrieve checkout session & setup intent @@ -1041,7 +1041,7 @@ if (isset($_GET['delete_saved_payment'])) { try { // Initialize Stripe - require_once '../plugins/stripe-php/init.php'; + require_once '../libs/stripe-php/init.php'; $stripe = new \Stripe\StripeClient($stripe_secret_key); // Detach the payment method from Stripe diff --git a/client/saved_payment_methods.php b/client/saved_payment_methods.php index da7d970b..037bcfe2 100644 --- a/client/saved_payment_methods.php +++ b/client/saved_payment_methods.php @@ -11,7 +11,7 @@ if ($session_contact_primary == 0 && !$session_contact_is_billing_contact) { } // Initialize Stripe -require_once '../plugins/stripe-php/init.php'; +require_once '../libs/stripe-php/init.php'; // Get Stripe provider info $stripe_provider_query = mysqli_query($mysqli, " diff --git a/client/ticket.php b/client/ticket.php index 8d96c563..288a566b 100644 --- a/client/ticket.php +++ b/client/ticket.php @@ -7,7 +7,7 @@ require_once "includes/inc_all.php"; //Initialize the HTML Purifier to prevent XSS -require "../plugins/htmlpurifier/HTMLPurifier.standalone.php"; +require "../libs/htmlpurifier/HTMLPurifier.standalone.php"; $purifier_config = HTMLPurifier_Config::createDefault(); $purifier_config->set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one diff --git a/cron/cron.php b/cron/cron.php index 7a76b333..f14e9bcd 100644 --- a/cron/cron.php +++ b/cron/cron.php @@ -838,7 +838,7 @@ while ($row = mysqli_fetch_assoc($sql_recurring_payments)) { // Stripe if ($provider_name === "Stripe") { if ($provider_private_key && $stripe_customer_id && $stripe_payment_method_id) { - require_once __DIR__ . '/../plugins/stripe-php/init.php'; + require_once __DIR__ . '/../libs/stripe-php/init.php'; $stripe = new \Stripe\StripeClient($provider_private_key); $balance_to_pay = round($invoice_amount, 2); diff --git a/cron/mail_queue.php b/cron/mail_queue.php index d5000853..41cb0ffe 100644 --- a/cron/mail_queue.php +++ b/cron/mail_queue.php @@ -10,14 +10,14 @@ if (php_sapi_name() !== 'cli') { require_once "../config.php"; require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; -require_once "../plugins/vendor/autoload.php"; +require_once "../libs/vendor/autoload.php"; // PHP Mailer Libs -require_once "../plugins/PHPMailer/src/Exception.php"; -require_once "../plugins/PHPMailer/src/PHPMailer.php"; -require_once "../plugins/PHPMailer/src/SMTP.php"; -require_once "../plugins/PHPMailer/src/OAuthTokenProvider.php"; -require_once "../plugins/PHPMailer/src/OAuth.php"; +require_once "../libs/PHPMailer/src/Exception.php"; +require_once "../libs/PHPMailer/src/PHPMailer.php"; +require_once "../libs/PHPMailer/src/SMTP.php"; +require_once "../libs/PHPMailer/src/OAuthTokenProvider.php"; +require_once "../libs/PHPMailer/src/OAuth.php"; use PHPMailer\PHPMailer\PHPMailer; use PHPMailer\PHPMailer\Exception; diff --git a/cron/ticket_email_parser.php b/cron/ticket_email_parser.php index 7b1877d2..07c2338d 100644 --- a/cron/ticket_email_parser.php +++ b/cron/ticket_email_parser.php @@ -16,7 +16,7 @@ if (php_sapi_name() !== 'cli') { } // Autoload (Webklex & any composer deps) -require_once "../plugins/vendor/autoload.php"; +require_once "../libs/vendor/autoload.php"; // Get ITFlow config & helper functions require_once "../config.php"; diff --git a/functions.php b/functions.php index eebf38de..42f29514 100644 --- a/functions.php +++ b/functions.php @@ -976,7 +976,7 @@ function addToMailQueue($data) { function createiCalStr($datetime, $title, $description, $location) { - require_once "plugins/zapcal/zapcallib.php"; + require_once "libs/zapcal/zapcallib.php"; // Create the iCal object $cal_event = new ZCiCal(); @@ -1009,7 +1009,7 @@ function isMobile() } function createiCalStrCancel($originaliCalStr) { - require_once "plugins/zapcal/zapcallib.php"; + require_once "libs/zapcal/zapcallib.php"; // Import the original iCal string $cal_event = new ZCiCal($originaliCalStr); diff --git a/guest/guest_ajax.php b/guest/guest_ajax.php index aba9b1c5..851431ad 100644 --- a/guest/guest_ajax.php +++ b/guest/guest_ajax.php @@ -11,7 +11,7 @@ require_once "../config.php"; // Set Timezone require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; -require_once "../plugins/totp/totp.php"; +require_once "../libs/totp/totp.php"; /* @@ -69,7 +69,7 @@ if (isset($_GET['stripe_create_pi'])) { } $stripe_secret_key = $stripe_provider['payment_provider_private_key']; - require_once '../plugins/stripe-php/init.php'; + require_once '../libs/stripe-php/init.php'; $pi_description = "ITFlow: $client_name payment of $invoice_currency_code $balance_to_pay for $invoice_prefix$invoice_number"; diff --git a/guest/guest_approve_ticket_task.php b/guest/guest_approve_ticket_task.php index e59f0635..a9b19883 100644 --- a/guest/guest_approve_ticket_task.php +++ b/guest/guest_approve_ticket_task.php @@ -3,7 +3,7 @@ require_once "includes/inc_all_guest.php"; //Initialize the HTML Purifier to prevent XSS -require_once "../plugins/htmlpurifier/HTMLPurifier.standalone.php"; +require_once "../libs/htmlpurifier/HTMLPurifier.standalone.php"; $purifier_config = HTMLPurifier_Config::createDefault(); $purifier_config->set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one diff --git a/guest/guest_pay_invoice_stripe.php b/guest/guest_pay_invoice_stripe.php index ba9750a4..758f86c5 100644 --- a/guest/guest_pay_invoice_stripe.php +++ b/guest/guest_pay_invoice_stripe.php @@ -76,7 +76,7 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent - +

@@ -161,7 +161,7 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent $pi_id = sanitizeInput($_GET['payment_intent']); $pi_cs = $_GET['payment_intent_client_secret']; - require_once '../plugins/stripe-php/init.php'; + require_once '../libs/stripe-php/init.php'; \Stripe\Stripe::setApiKey($stripe_secret); $pi_obj = \Stripe\PaymentIntent::retrieve($pi_id); diff --git a/guest/guest_post.php b/guest/guest_post.php index 53c53057..b0d1f81c 100644 --- a/guest/guest_post.php +++ b/guest/guest_post.php @@ -329,7 +329,7 @@ if (isset($_GET['export_quote_pdf'])) { //Set Currency Format $currency_format = numfmt_create($company_locale, NumberFormatter::CURRENCY); - require_once("../plugins/TCPDF/tcpdf.php"); + require_once("../libs/TCPDF/tcpdf.php"); // Start TCPDF $pdf = new TCPDF('P', 'mm', 'A4', true, 'UTF-8', false); @@ -555,7 +555,7 @@ if (isset($_GET['export_invoice_pdf'])) { //Set Badge color based off of invoice status $invoice_badge_color = getInvoiceBadgeColor($invoice_status); - require_once("../plugins/TCPDF/tcpdf.php"); + require_once("../libs/TCPDF/tcpdf.php"); // Start TCPDF $pdf = new TCPDF('P', 'mm', 'A4', true, 'UTF-8', false); diff --git a/guest/guest_view_item.php b/guest/guest_view_item.php index 42b64a57..0a54ba31 100644 --- a/guest/guest_view_item.php +++ b/guest/guest_view_item.php @@ -8,7 +8,7 @@ require_once "includes/inc_all_guest.php"; //Initialize the HTML Purifier to prevent XSS -require "../plugins/htmlpurifier/HTMLPurifier.standalone.php"; +require "../libs/htmlpurifier/HTMLPurifier.standalone.php"; $purifier_config = HTMLPurifier_Config::createDefault(); $purifier_config->set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one diff --git a/guest/guest_view_ticket.php b/guest/guest_view_ticket.php index 48ad8c2d..39ceffa8 100644 --- a/guest/guest_view_ticket.php +++ b/guest/guest_view_ticket.php @@ -3,7 +3,7 @@ require_once "includes/inc_all_guest.php"; //Initialize the HTML Purifier to prevent XSS -require "../plugins/htmlpurifier/HTMLPurifier.standalone.php"; +require "../libs/htmlpurifier/HTMLPurifier.standalone.php"; $purifier_config = HTMLPurifier_Config::createDefault(); $purifier_config->set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one diff --git a/guest/includes/guest_header.php b/guest/includes/guest_header.php index c45cdac3..00da6f2d 100644 --- a/guest/includes/guest_header.php +++ b/guest/includes/guest_header.php @@ -17,19 +17,19 @@ - + - + - - - - + + + + - - + + diff --git a/includes/footer.php b/includes/footer.php index ce5b8bf2..403e68c5 100644 --- a/includes/footer.php +++ b/includes/footer.php @@ -30,24 +30,24 @@ if (basename(dirname($_SERVER['REQUEST_URI'])) === 'guest') { ?> - + - - - - - - - - - + + + + + + + + + - - + + - + diff --git a/includes/header.php b/includes/header.php index 9913f39b..b8d40f8a 100644 --- a/includes/header.php +++ b/includes/header.php @@ -24,22 +24,22 @@ header("X-Frame-Options: DENY"); - + - - - - - - - + + + + + + + - + - - + + - + - + - + @@ -746,9 +746,9 @@ if (!$config_whitelabel_enabled) { } ?> - - - + + + diff --git a/setup/index.php b/setup/index.php index 8cebdf1b..1e6f07fb 100644 --- a/setup/index.php +++ b/setup/index.php @@ -728,12 +728,12 @@ if (isset($_POST['add_telemetry'])) { ITFlow Setup - + - + - - + + @@ -1622,14 +1622,14 @@ if (isset($_POST['add_telemetry'])) { - + - + - - + + - +