From 50371558c6d3ce9fc668ea4e5fec85777b20e67c Mon Sep 17 00:00:00 2001
From: wrongecho <marcus@itflow.org>
Date: Thu, 2 Jan 2025 21:27:14 +0000
Subject: [PATCH 1/2] Adjust cron/cli scripts in subdir to load required
 scripts from parent

---
 scripts/cron.php                       |  6 +++---
 scripts/cron_certificate_refresher.php |  6 +++---
 scripts/cron_domain_refresher.php      |  6 +++---
 scripts/cron_mail_queue.php            |  6 +++---
 scripts/cron_ticket_email_parser.php   | 26 +++++++++++++-------------
 scripts/setup_cli.php                  |  8 ++++----
 scripts/update_cli.php                 |  8 ++++----
 7 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/scripts/cron.php b/scripts/cron.php
index 6af84a02..46e00a47 100644
--- a/scripts/cron.php
+++ b/scripts/cron.php
@@ -3,12 +3,12 @@
 // Set working directory to the directory this cron script lives at.
 chdir(dirname(__FILE__));
 
-require_once "config.php";
+require_once "../config.php";
 
 // Set Timezone
-require_once "inc_set_timezone.php";
+require_once "../inc_set_timezone.php";
 
-require_once "functions.php";
+require_once "../functions.php";
 
 
 $sql_companies = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1");
diff --git a/scripts/cron_certificate_refresher.php b/scripts/cron_certificate_refresher.php
index e7ffb1c4..739a41de 100644
--- a/scripts/cron_certificate_refresher.php
+++ b/scripts/cron_certificate_refresher.php
@@ -1,11 +1,11 @@
 <?php
 
-require_once "config.php";
+require_once "../config.php";
 
 // Set Timezone
-require_once "inc_set_timezone.php";
+require_once "../inc_set_timezone.php";
 
-require_once "functions.php";
+require_once "../functions.php";
 
 
 $sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE settings.company_id = 1");
diff --git a/scripts/cron_domain_refresher.php b/scripts/cron_domain_refresher.php
index 5a312bb6..b224ec59 100644
--- a/scripts/cron_domain_refresher.php
+++ b/scripts/cron_domain_refresher.php
@@ -1,11 +1,11 @@
 <?php
 
-require_once "config.php";
+require_once "../config.php";
 
 // Set Timezone
-require_once "inc_set_timezone.php";
+require_once "../inc_set_timezone.php";
 
-require_once "functions.php";
+require_once "../functions.php";
 
 
 $sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE settings.company_id = 1");
diff --git a/scripts/cron_mail_queue.php b/scripts/cron_mail_queue.php
index c3642094..300df6e9 100644
--- a/scripts/cron_mail_queue.php
+++ b/scripts/cron_mail_queue.php
@@ -1,11 +1,11 @@
 <?php
 
-require_once "config.php";
+require_once "../config.php";
 
 // Set Timezone
-require_once "inc_set_timezone.php";
+require_once "../inc_set_timezone.php";
 
-require_once "functions.php";
+require_once "../functions.php";
 
 $sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE company_id = 1");
 
diff --git a/scripts/cron_ticket_email_parser.php b/scripts/cron_ticket_email_parser.php
index 22b21d96..d361fb9a 100644
--- a/scripts/cron_ticket_email_parser.php
+++ b/scripts/cron_ticket_email_parser.php
@@ -11,14 +11,14 @@ $script_start_time = microtime(true); // unComment when Debugging Execution time
 chdir(dirname(__FILE__));
 
 // Get ITFlow config & helper functions
-require_once "config.php";
+require_once "../config.php";
 
 // Set Timezone
-require_once "inc_set_timezone.php";
-require_once "functions.php";
+require_once "../inc_set_timezone.php";
+require_once "../functions.php";
 
 // Get settings for the "default" company
-require_once "get_settings.php";
+require_once "../get_settings.php";
 
 $config_ticket_prefix = sanitizeInput($config_ticket_prefix);
 $config_ticket_from_name = sanitizeInput($config_ticket_from_name);
@@ -73,15 +73,15 @@ file_put_contents($lock_file_path, "Locked");
 
 // PHP Mail Parser
 use PhpMimeMailParser\Parser;
-require_once "plugins/php-mime-mail-parser/Contracts/CharsetManager.php";
-require_once "plugins/php-mime-mail-parser/Contracts/Middleware.php";
-require_once "plugins/php-mime-mail-parser/Attachment.php";
-require_once "plugins/php-mime-mail-parser/Charset.php";
-require_once "plugins/php-mime-mail-parser/Exception.php";
-require_once "plugins/php-mime-mail-parser/Middleware.php";
-require_once "plugins/php-mime-mail-parser/MiddlewareStack.php";
-require_once "plugins/php-mime-mail-parser/MimePart.php";
-require_once "plugins/php-mime-mail-parser/Parser.php";
+require_once "../plugins/php-mime-mail-parser/Contracts/CharsetManager.php";
+require_once "../plugins/php-mime-mail-parser/Contracts/Middleware.php";
+require_once "../plugins/php-mime-mail-parser/Attachment.php";
+require_once "../plugins/php-mime-mail-parser/Charset.php";
+require_once "../plugins/php-mime-mail-parser/Exception.php";
+require_once "../plugins/php-mime-mail-parser/Middleware.php";
+require_once "../plugins/php-mime-mail-parser/MiddlewareStack.php";
+require_once "../plugins/php-mime-mail-parser/MimePart.php";
+require_once "../plugins/php-mime-mail-parser/Parser.php";
 
 // Allowed attachment extensions
 $allowed_extensions = array('jpg', 'jpeg', 'gif', 'png', 'webp', 'pdf', 'txt', 'md', 'doc', 'docx', 'csv', 'xls', 'xlsx', 'xlsm', 'zip', 'tar', 'gz');
diff --git a/scripts/setup_cli.php b/scripts/setup_cli.php
index cf42996c..ef03df2b 100644
--- a/scripts/setup_cli.php
+++ b/scripts/setup_cli.php
@@ -91,12 +91,12 @@ if (isset($options['help'])) {
     exit(0);
 }
 
-if (file_exists("config.php")) {
-    include "config.php";
+if (file_exists("../config.php")) {
+    include "../config.php";
 }
 
-include "functions.php";
-include "database_version.php";
+include "../functions.php";
+include "../database_version.php";
 
 if (!isset($config_enable_setup)) {
     $config_enable_setup = 1;
diff --git a/scripts/update_cli.php b/scripts/update_cli.php
index 42351838..b8a82e3a 100644
--- a/scripts/update_cli.php
+++ b/scripts/update_cli.php
@@ -20,8 +20,8 @@ if ($currentUser !== $fileOwner) {
     exit(1);
 }
 
-require_once "config.php";
-require_once "functions.php";
+require_once "../config.php";
+require_once "../functions.php";
 
 // A function to print the help message so that we don't duplicate it
 function printHelp() {
@@ -103,7 +103,7 @@ if (isset($options['update']) || isset($options['force_update'])) {
 
 // If "update_db" is requested
 if (isset($options['update_db'])) {
-    require_once "database_version.php";
+    require_once "../database_version.php";
 
     $latest_db_version = LATEST_DATABASE_VERSION;
 
@@ -114,7 +114,7 @@ if (isset($options['update_db'])) {
     $old_db_version = $row['config_current_database_version'];
 
     // Now include the update logic
-    require_once "database_updates.php";
+    require_once "../database_updates.php";
 
     // After database_updates.php has done its job, fetch the updated current DB version again
     $result = mysqli_query($mysqli, "SELECT config_current_database_version FROM settings LIMIT 1");

From 7ebac0a674657c1b83b79dd58028eaca4e80b332 Mon Sep 17 00:00:00 2001
From: wrongecho <marcus@itflow.org>
Date: Thu, 2 Jan 2025 21:30:18 +0000
Subject: [PATCH 2/2] Sonar recommendations

---
 scripts/setup_cli.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/setup_cli.php b/scripts/setup_cli.php
index ef03df2b..df996f66 100644
--- a/scripts/setup_cli.php
+++ b/scripts/setup_cli.php
@@ -92,11 +92,11 @@ if (isset($options['help'])) {
 }
 
 if (file_exists("../config.php")) {
-    include "../config.php";
+    include_once "../config.php";
 }
 
-include "../functions.php";
-include "../database_version.php";
+require_once "../functions.php";
+require_once "../database_version.php";
 
 if (!isset($config_enable_setup)) {
     $config_enable_setup = 1;