Use __dir__ to find resources/require.php

This commit is contained in:
markjcrane 2023-06-16 22:49:09 -06:00
parent d4231ab0e1
commit 32051873be
21 changed files with 36 additions and 92 deletions

View File

@ -24,12 +24,8 @@
* SUCH DAMAGE. * 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 //includes files
require_once "resources/require.php"; require_once dirname(__DIR__, 2) . "/resources/require.php";
require_once "resources/check_auth.php"; require_once "resources/check_auth.php";
//check permissions //check permissions

View File

@ -2,16 +2,14 @@
//check the permission //check the permission
if (defined('STDIN')) { if (defined('STDIN')) {
//set the include path //includes files
$conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); require_once dirname(__DIR__, 4) . "/resources/require.php";
set_include_path(parse_ini_file($conf[0])['document.root']);
} }
else { else {
exit; exit;
} }
//includes files //includes files
require_once "resources/require.php";
require_once "resources/pdo.php"; require_once "resources/pdo.php";
include "resources/classes/permissions.php"; include "resources/classes/permissions.php";
require $_SERVER['DOCUMENT_ROOT']."/app/email_queue/resources/functions/transcribe.php"; require $_SERVER['DOCUMENT_ROOT']."/app/email_queue/resources/functions/transcribe.php";

View File

@ -2,16 +2,14 @@
//check the permission //check the permission
if (defined('STDIN')) { if (defined('STDIN')) {
//set the include path //includes files
$conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); require_once dirname(__DIR__, 4) . "/resources/require.php";
set_include_path(parse_ini_file($conf[0])['document.root']);
} }
else { else {
exit; exit;
} }
//include files //include files
require_once "resources/require.php";
include "resources/classes/permissions.php"; include "resources/classes/permissions.php";
require $_SERVER['DOCUMENT_ROOT']."/app/email_queue/resources/functions/transcribe.php"; require $_SERVER['DOCUMENT_ROOT']."/app/email_queue/resources/functions/transcribe.php";

View File

@ -2,9 +2,8 @@
//add the document root to the include path //add the document root to the include path
if (defined('STDIN')) { if (defined('STDIN')) {
$config_glob = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); //includes files
$conf = parse_ini_file($config_glob[0]); require_once dirname(__DIR__, 4) . "/resources/require.php";
set_include_path($conf['document.root']);
} }
else { else {
exit; exit;

View File

@ -24,12 +24,8 @@
//check the permission //check the permission
if (defined('STDIN')) { 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 //includes files
require_once "resources/require.php"; require_once dirname(__DIR__, 4) . "/resources/require.php";
} }
else { else {
//only allow running this from command line //only allow running this from command line

View File

@ -86,6 +86,9 @@ if (!class_exists('scripts')) {
*/ */
public function copy_files() { public function copy_files() {
//includes files
//require dirname(__DIR__, 2) . "/resources/require.php";
//read the config.conf settings //read the config.conf settings
$config_glob = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); $config_glob = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE);
$conf = parse_ini_file($config_glob[0]); $conf = parse_ini_file($config_glob[0]);

View File

@ -1,11 +1,7 @@
<?php <?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']);
//includes files //includes files
require_once "resources/require.php"; require_once dirname(__DIR__, 4) . "/resources/require.php";
//check permisions //check permisions
require_once "resources/check_auth.php"; require_once "resources/check_auth.php";

View File

@ -1,7 +1,7 @@
<?php <?php
//includes //includes files
require_once "resources/require.php"; require_once dirname(__DIR__, 4) . "/resources/require.php";
//check permisions //check permisions
require_once "resources/check_auth.php"; require_once "resources/check_auth.php";

View File

@ -1,11 +1,7 @@
<?php <?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']);
//includes files //includes files
require_once "resources/require.php"; require_once dirname(__DIR__, 4) . "/resources/require.php";
//check permisions //check permisions
require_once "resources/check_auth.php"; require_once "resources/check_auth.php";

View File

@ -1,11 +1,7 @@
<?php <?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']);
//includes files //includes files
require_once "resources/require.php"; require_once dirname(__DIR__, 4) . "/resources/require.php";
//check permisions //check permisions
require_once "resources/check_auth.php"; require_once "resources/check_auth.php";

View File

@ -29,9 +29,9 @@ class events {
*/ */
public function __construct() { public function __construct() {
//create the database connection //create the database connection
//set the include path
$conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); //includes files
set_include_path(parse_ini_file($conf[0])['document.root']); require_once dirname(__DIR__, 4) . "/resources/require.php";
//includes files //includes files
require_once "resources/classes/database.php"; require_once "resources/classes/database.php";

View File

@ -26,10 +26,6 @@
//check permisions //check permisions
if (empty($included) || !$included) { if (empty($included) || !$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 //includes files
require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once dirname(__DIR__, 2) . "/resources/require.php";
require_once "resources/check_auth.php"; require_once "resources/check_auth.php";

View File

@ -164,11 +164,6 @@
exit; exit;
} }
//set the include path
$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']);
//add the database schema //add the database schema
$output = shell_exec('cd '.$_SERVER["DOCUMENT_ROOT"].' && php /var/www/fusionpbx/core/upgrade/upgrade_schema.php'); $output = shell_exec('cd '.$_SERVER["DOCUMENT_ROOT"].' && php /var/www/fusionpbx/core/upgrade/upgrade_schema.php');

View File

@ -17,19 +17,15 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
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. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
*/ */
//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 //includes files
require_once "resources/require.php"; require_once dirname(__DIR__, 2) . "/resources/require.php";
require_once "resources/check_auth.php"; require_once "resources/check_auth.php";
//check permissions //check permissions

View File

@ -26,10 +26,6 @@
//check permissions //check permissions
if(!defined('STDIN')) { 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 //includes files
require_once dirname(__DIR__, 2) . "/resources/require.php"; require_once dirname(__DIR__, 2) . "/resources/require.php";
require_once "resources/check_auth.php"; require_once "resources/check_auth.php";

View File

@ -37,12 +37,8 @@
$format = 'text'; //html, text $format = 'text'; //html, text
} }
else if (!$included) { 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 //includes files
require_once "resources/require.php"; require_once dirname(__DIR__, 2) . "/resources/require.php";
require_once "resources/check_auth.php"; require_once "resources/check_auth.php";
if (permission_exists('upgrade_schema') || if_group("superadmin")) { if (permission_exists('upgrade_schema') || if_group("superadmin")) {
//echo "access granted"; //echo "access granted";

View File

@ -49,13 +49,11 @@ class captcha {
*/ */
public function image_captcha() { public function image_captcha() {
//set the include path //includes files
$conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); require dirname(__DIR__, 2) . "/resources/require.php";
set_include_path(parse_ini_file($conf[0])['document.root']);
//includes files //includes files
require_once "resources/functions.php"; require_once "resources/functions.php";
error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING ); //hide notices and warnings
//start the session //start the session
ini_set("session.cookie_httponly", True); ini_set("session.cookie_httponly", True);

View File

@ -63,13 +63,10 @@ class config {
* @var string $config_path - full path to the config.php file * @var string $config_path - full path to the config.php file
*/ */
public function find() { 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 //includes files
require_once "resources/require.php"; require dirname(__DIR__, 2) . "/resources/require.php";
// find the file
//find the file
if (file_exists($_SERVER["PROJECT_ROOT"]."/resources/config.php")) { if (file_exists($_SERVER["PROJECT_ROOT"]."/resources/config.php")) {
$this->config_path = $_SERVER["PROJECT_ROOT"]."/resources/config.php"; $this->config_path = $_SERVER["PROJECT_ROOT"]."/resources/config.php";
} elseif (file_exists("/etc/fusionpbx/config.php")) { } elseif (file_exists("/etc/fusionpbx/config.php")) {
@ -80,6 +77,7 @@ class config {
else { else {
$this->config_path = ''; $this->config_path = '';
} }
//return the path //return the path
return $this->config_path; return $this->config_path;
} }

View File

@ -391,6 +391,9 @@
*/ */
public function connect() { public function connect() {
//includes files
//require dirname(__DIR__, 2) . "/resources/require.php";
//set the include path //set the include path
$conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE); $conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE);
set_include_path(parse_ini_file($conf[0])['document.root']); set_include_path(parse_ini_file($conf[0])['document.root']);

View File

@ -601,18 +601,14 @@ if (!class_exists('domains')) {
*/ */
public function upgrade() { public function upgrade() {
//includes files
require dirname(__DIR__, 2) . "/resources/require.php";
//get the variables //get the variables
$config = new config; $config = new config;
$config_path = $config->find(); $config_path = $config->find();
$config->get(); $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 //check for default settings
$this->settings(); $this->settings();

View File

@ -43,12 +43,8 @@ if (!class_exists('schema')) {
$database->connect(); $database->connect();
$this->db = $database->db; $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 //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 //get the list of installed apps from the core and mod directories
$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php"); $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_path = $config->db_path;
$db_port = $config->db_port; $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 //includes files
include "resources/require.php"; require_once dirname(__DIR__, 2) . "/resources/require.php";
//add multi-lingual support //add multi-lingual support
if (!isset($text)) { if (!isset($text)) {