Merge pull request #1137 from itflow-org/cron-scripts-move

Adjust cron/cli scripts in subdir to load required scripts from parent

Author: wrongecho

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");

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");

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");

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");
 

scripts/cron_ticket_email_parser.php

@@ -11,14 +11,14 @@
 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 @@
 
 // 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');

scripts/setup_cli.php

@@ -91,12 +91,12 @@
     exit(0);
 }
 
-if (file_exists("config.php")) {
-    include "config.php";
+if (file_exists("../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;

scripts/update_cli.php

@@ -20,8 +20,8 @@
     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 @@ function printHelp() {
 
 // 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 @@ function printHelp() {
     $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");