From 32051873be3a92e7eb2a23260d601dcac8edf30f Mon Sep 17 00:00:00 2001 From: markjcrane Date: Fri, 16 Jun 2023 22:49:09 -0600 Subject: [PATCH] Use __dir__ to find resources/require.php --- app/email_queue/email_test.php | 6 +----- app/email_queue/resources/jobs/email_queue.php | 6 ++---- app/email_queue/resources/jobs/email_send.php | 6 ++---- app/email_queue/resources/service/email_queue.php | 5 ++--- app/event_guard/resources/service/event_guard.php | 6 +----- app/scripts/resources/classes/scripts.php | 3 +++ app/switch/resources/dashboard/switch_status.php | 6 +----- app/system/resources/dashboard/system_counts.php | 4 ++-- app/system/resources/dashboard/system_cpu_status.php | 6 +----- app/system/resources/dashboard/system_status.php | 6 +----- core/events/resources/classes/events.php | 6 +++--- core/groups/permissions_default.php | 4 ---- core/install/install.php | 5 ----- core/menu/menu_reload.php | 8 ++------ core/menu/menu_restore_default.php | 4 ---- core/upgrade/upgrade_schema.php | 6 +----- resources/classes/captcha.php | 6 ++---- resources/classes/config.php | 10 ++++------ resources/classes/database.php | 3 +++ resources/classes/domains.php | 10 +++------- resources/classes/schema.php | 12 ++---------- 21 files changed, 36 insertions(+), 92 deletions(-) diff --git a/app/email_queue/email_test.php b/app/email_queue/email_test.php index 7c886e2819..e7ce95b38f 100644 --- a/app/email_queue/email_test.php +++ b/app/email_queue/email_test.php @@ -24,12 +24,8 @@ * SUCH DAMAGE. */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/app/email_queue/resources/jobs/email_queue.php b/app/email_queue/resources/jobs/email_queue.php index 27c2e80dfb..bbbe484919 100644 --- a/app/email_queue/resources/jobs/email_queue.php +++ b/app/email_queue/resources/jobs/email_queue.php @@ -2,16 +2,14 @@ //check the permission if (defined('STDIN')) { - //set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); + //includes files + require_once dirname(__DIR__, 4) . "/resources/require.php"; } else { exit; } //includes files - require_once "resources/require.php"; require_once "resources/pdo.php"; include "resources/classes/permissions.php"; require $_SERVER['DOCUMENT_ROOT']."/app/email_queue/resources/functions/transcribe.php"; diff --git a/app/email_queue/resources/jobs/email_send.php b/app/email_queue/resources/jobs/email_send.php index 01f3d4a4bf..ab10094a2f 100644 --- a/app/email_queue/resources/jobs/email_send.php +++ b/app/email_queue/resources/jobs/email_send.php @@ -2,16 +2,14 @@ //check the permission if (defined('STDIN')) { - //set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); + //includes files + require_once dirname(__DIR__, 4) . "/resources/require.php"; } else { exit; } //include files - require_once "resources/require.php"; include "resources/classes/permissions.php"; require $_SERVER['DOCUMENT_ROOT']."/app/email_queue/resources/functions/transcribe.php"; diff --git a/app/email_queue/resources/service/email_queue.php b/app/email_queue/resources/service/email_queue.php index b9cfe90fbf..ec0149a95f 100644 --- a/app/email_queue/resources/service/email_queue.php +++ b/app/email_queue/resources/service/email_queue.php @@ -2,9 +2,8 @@ //add the document root to the include path if (defined('STDIN')) { - $config_glob = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - $conf = parse_ini_file($config_glob[0]); - set_include_path($conf['document.root']); + //includes files + require_once dirname(__DIR__, 4) . "/resources/require.php"; } else { exit; diff --git a/app/event_guard/resources/service/event_guard.php b/app/event_guard/resources/service/event_guard.php index 1eb4f06e82..bbbc81b373 100644 --- a/app/event_guard/resources/service/event_guard.php +++ b/app/event_guard/resources/service/event_guard.php @@ -24,12 +24,8 @@ //check the permission if (defined('STDIN')) { - //set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 4) . "/resources/require.php"; } else { //only allow running this from command line diff --git a/app/scripts/resources/classes/scripts.php b/app/scripts/resources/classes/scripts.php index df0e24760f..b89bbb2e60 100644 --- a/app/scripts/resources/classes/scripts.php +++ b/app/scripts/resources/classes/scripts.php @@ -86,6 +86,9 @@ if (!class_exists('scripts')) { */ public function copy_files() { + //includes files + //require dirname(__DIR__, 2) . "/resources/require.php"; + //read the config.conf settings $config_glob = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); $conf = parse_ini_file($config_glob[0]); diff --git a/app/switch/resources/dashboard/switch_status.php b/app/switch/resources/dashboard/switch_status.php index af5ddcab25..833b1ef6f2 100644 --- a/app/switch/resources/dashboard/switch_status.php +++ b/app/switch/resources/dashboard/switch_status.php @@ -1,11 +1,7 @@ - Portions created by the Initial Developer are Copyright (C) 2020 + Portions created by the Initial Developer are Copyright (C) 2023 the Initial Developer. All Rights Reserved. Contributor(s): Mark J Crane */ -//set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; //check permissions diff --git a/core/menu/menu_restore_default.php b/core/menu/menu_restore_default.php index 56d0f737d8..10901bc9ce 100644 --- a/core/menu/menu_restore_default.php +++ b/core/menu/menu_restore_default.php @@ -26,10 +26,6 @@ //check permissions if(!defined('STDIN')) { - //set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; diff --git a/core/upgrade/upgrade_schema.php b/core/upgrade/upgrade_schema.php index 1f5203a296..aa60ffef8a 100644 --- a/core/upgrade/upgrade_schema.php +++ b/core/upgrade/upgrade_schema.php @@ -37,12 +37,8 @@ $format = 'text'; //html, text } else if (!$included) { - //set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once "resources/check_auth.php"; if (permission_exists('upgrade_schema') || if_group("superadmin")) { //echo "access granted"; diff --git a/resources/classes/captcha.php b/resources/classes/captcha.php index 972b20f4c7..2c08aae56d 100644 --- a/resources/classes/captcha.php +++ b/resources/classes/captcha.php @@ -49,13 +49,11 @@ class captcha { */ public function image_captcha() { - //set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); + //includes files + require dirname(__DIR__, 2) . "/resources/require.php"; //includes files require_once "resources/functions.php"; - error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING ); //hide notices and warnings //start the session ini_set("session.cookie_httponly", True); diff --git a/resources/classes/config.php b/resources/classes/config.php index 679e3eb9b7..3d1ae6c006 100644 --- a/resources/classes/config.php +++ b/resources/classes/config.php @@ -63,13 +63,10 @@ class config { * @var string $config_path - full path to the config.php file */ public function find() { - //set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - require_once "resources/require.php"; - // find the file + require dirname(__DIR__, 2) . "/resources/require.php"; + + //find the file if (file_exists($_SERVER["PROJECT_ROOT"]."/resources/config.php")) { $this->config_path = $_SERVER["PROJECT_ROOT"]."/resources/config.php"; } elseif (file_exists("/etc/fusionpbx/config.php")) { @@ -80,6 +77,7 @@ class config { else { $this->config_path = ''; } + //return the path return $this->config_path; } diff --git a/resources/classes/database.php b/resources/classes/database.php index 324db275b4..11f3d32526 100644 --- a/resources/classes/database.php +++ b/resources/classes/database.php @@ -391,6 +391,9 @@ */ public function connect() { + //includes files + //require dirname(__DIR__, 2) . "/resources/require.php"; + //set the include path $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); set_include_path(parse_ini_file($conf[0])['document.root']); diff --git a/resources/classes/domains.php b/resources/classes/domains.php index becc9c3af9..1798078378 100644 --- a/resources/classes/domains.php +++ b/resources/classes/domains.php @@ -601,18 +601,14 @@ if (!class_exists('domains')) { */ public function upgrade() { + //includes files + require dirname(__DIR__, 2) . "/resources/require.php"; + //get the variables $config = new config; $config_path = $config->find(); $config->get(); - //set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - - //includes files - include "resources/require.php"; - //check for default settings $this->settings(); diff --git a/resources/classes/schema.php b/resources/classes/schema.php index 89388cfd90..6ee73f22bd 100644 --- a/resources/classes/schema.php +++ b/resources/classes/schema.php @@ -43,12 +43,8 @@ if (!class_exists('schema')) { $database->connect(); $this->db = $database->db; - //set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - include "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; //get the list of installed apps from the core and mod directories $config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php"); @@ -491,12 +487,8 @@ if (!class_exists('schema')) { $db_path = $config->db_path; $db_port = $config->db_port; - //set the include path - $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); - set_include_path(parse_ini_file($conf[0])['document.root']); - //includes files - include "resources/require.php"; + require_once dirname(__DIR__, 2) . "/resources/require.php"; //add multi-lingual support if (!isset($text)) {