mirror of
https://github.com/itflow-org/itflow
synced 2026-03-04 21:04:50 +00:00
Merge pull request #1137 from itflow-org/cron-scripts-move
Adjust cron/cli scripts in subdir to load required scripts from parent
This commit is contained in:
@@ -3,12 +3,12 @@
|
|||||||
// Set working directory to the directory this cron script lives at.
|
// Set working directory to the directory this cron script lives at.
|
||||||
chdir(dirname(__FILE__));
|
chdir(dirname(__FILE__));
|
||||||
|
|
||||||
require_once "config.php";
|
require_once "../config.php";
|
||||||
|
|
||||||
// Set Timezone
|
// 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");
|
$sql_companies = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1");
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
require_once "config.php";
|
require_once "../config.php";
|
||||||
|
|
||||||
// Set Timezone
|
// 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");
|
$sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE settings.company_id = 1");
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
require_once "config.php";
|
require_once "../config.php";
|
||||||
|
|
||||||
// Set Timezone
|
// 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");
|
$sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE settings.company_id = 1");
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
require_once "config.php";
|
require_once "../config.php";
|
||||||
|
|
||||||
// Set Timezone
|
// 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");
|
$sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE company_id = 1");
|
||||||
|
|
||||||
|
|||||||
@@ -11,14 +11,14 @@ $script_start_time = microtime(true); // unComment when Debugging Execution time
|
|||||||
chdir(dirname(__FILE__));
|
chdir(dirname(__FILE__));
|
||||||
|
|
||||||
// Get ITFlow config & helper functions
|
// Get ITFlow config & helper functions
|
||||||
require_once "config.php";
|
require_once "../config.php";
|
||||||
|
|
||||||
// Set Timezone
|
// Set Timezone
|
||||||
require_once "inc_set_timezone.php";
|
require_once "../inc_set_timezone.php";
|
||||||
require_once "functions.php";
|
require_once "../functions.php";
|
||||||
|
|
||||||
// Get settings for the "default" company
|
// 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_prefix = sanitizeInput($config_ticket_prefix);
|
||||||
$config_ticket_from_name = sanitizeInput($config_ticket_from_name);
|
$config_ticket_from_name = sanitizeInput($config_ticket_from_name);
|
||||||
@@ -73,15 +73,15 @@ file_put_contents($lock_file_path, "Locked");
|
|||||||
|
|
||||||
// PHP Mail Parser
|
// PHP Mail Parser
|
||||||
use PhpMimeMailParser\Parser;
|
use PhpMimeMailParser\Parser;
|
||||||
require_once "plugins/php-mime-mail-parser/Contracts/CharsetManager.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/Contracts/Middleware.php";
|
||||||
require_once "plugins/php-mime-mail-parser/Attachment.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/Charset.php";
|
||||||
require_once "plugins/php-mime-mail-parser/Exception.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/Middleware.php";
|
||||||
require_once "plugins/php-mime-mail-parser/MiddlewareStack.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/MimePart.php";
|
||||||
require_once "plugins/php-mime-mail-parser/Parser.php";
|
require_once "../plugins/php-mime-mail-parser/Parser.php";
|
||||||
|
|
||||||
// Allowed attachment extensions
|
// Allowed attachment extensions
|
||||||
$allowed_extensions = array('jpg', 'jpeg', 'gif', 'png', 'webp', 'pdf', 'txt', 'md', 'doc', 'docx', 'csv', 'xls', 'xlsx', 'xlsm', 'zip', 'tar', 'gz');
|
$allowed_extensions = array('jpg', 'jpeg', 'gif', 'png', 'webp', 'pdf', 'txt', 'md', 'doc', 'docx', 'csv', 'xls', 'xlsx', 'xlsm', 'zip', 'tar', 'gz');
|
||||||
|
|||||||
@@ -91,12 +91,12 @@ if (isset($options['help'])) {
|
|||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (file_exists("config.php")) {
|
if (file_exists("../config.php")) {
|
||||||
include "config.php";
|
include_once "../config.php";
|
||||||
}
|
}
|
||||||
|
|
||||||
include "functions.php";
|
require_once "../functions.php";
|
||||||
include "database_version.php";
|
require_once "../database_version.php";
|
||||||
|
|
||||||
if (!isset($config_enable_setup)) {
|
if (!isset($config_enable_setup)) {
|
||||||
$config_enable_setup = 1;
|
$config_enable_setup = 1;
|
||||||
|
|||||||
@@ -20,8 +20,8 @@ if ($currentUser !== $fileOwner) {
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
require_once "config.php";
|
require_once "../config.php";
|
||||||
require_once "functions.php";
|
require_once "../functions.php";
|
||||||
|
|
||||||
// A function to print the help message so that we don't duplicate it
|
// A function to print the help message so that we don't duplicate it
|
||||||
function printHelp() {
|
function printHelp() {
|
||||||
@@ -103,7 +103,7 @@ if (isset($options['update']) || isset($options['force_update'])) {
|
|||||||
|
|
||||||
// If "update_db" is requested
|
// If "update_db" is requested
|
||||||
if (isset($options['update_db'])) {
|
if (isset($options['update_db'])) {
|
||||||
require_once "database_version.php";
|
require_once "../database_version.php";
|
||||||
|
|
||||||
$latest_db_version = LATEST_DATABASE_VERSION;
|
$latest_db_version = LATEST_DATABASE_VERSION;
|
||||||
|
|
||||||
@@ -114,7 +114,7 @@ if (isset($options['update_db'])) {
|
|||||||
$old_db_version = $row['config_current_database_version'];
|
$old_db_version = $row['config_current_database_version'];
|
||||||
|
|
||||||
// Now include the update logic
|
// 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
|
// 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");
|
$result = mysqli_query($mysqli, "SELECT config_current_database_version FROM settings LIMIT 1");
|
||||||
|
|||||||
Reference in New Issue
Block a user