Use __dir__ to find resources/require.php
This commit is contained in:
parent
d4231ab0e1
commit
32051873be
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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]);
|
||||
|
|
|
|||
|
|
@ -1,11 +1,7 @@
|
|||
<?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
|
||||
require_once "resources/require.php";
|
||||
require_once dirname(__DIR__, 4) . "/resources/require.php";
|
||||
|
||||
//check permisions
|
||||
require_once "resources/check_auth.php";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
//includes
|
||||
require_once "resources/require.php";
|
||||
//includes files
|
||||
require_once dirname(__DIR__, 4) . "/resources/require.php";
|
||||
|
||||
//check permisions
|
||||
require_once "resources/check_auth.php";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,7 @@
|
|||
<?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
|
||||
require_once "resources/require.php";
|
||||
require_once dirname(__DIR__, 4) . "/resources/require.php";
|
||||
|
||||
//check permisions
|
||||
require_once "resources/check_auth.php";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,7 @@
|
|||
<?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
|
||||
require_once "resources/require.php";
|
||||
require_once dirname(__DIR__, 4) . "/resources/require.php";
|
||||
|
||||
//check permisions
|
||||
require_once "resources/check_auth.php";
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@ class events {
|
|||
*/
|
||||
public function __construct() {
|
||||
//create the database connection
|
||||
//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";
|
||||
|
||||
//includes files
|
||||
require_once "resources/classes/database.php";
|
||||
|
|
|
|||
|
|
@ -26,10 +26,6 @@
|
|||
|
||||
//check permisions
|
||||
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
|
||||
require_once dirname(__DIR__, 2) . "/resources/require.php";
|
||||
require_once "resources/check_auth.php";
|
||||
|
|
|
|||
|
|
@ -164,11 +164,6 @@
|
|||
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
|
||||
$output = shell_exec('cd '.$_SERVER["DOCUMENT_ROOT"].' && php /var/www/fusionpbx/core/upgrade/upgrade_schema.php');
|
||||
|
||||
|
|
|
|||
|
|
@ -17,19 +17,15 @@
|
|||
|
||||
The Initial Developer of the Original Code is
|
||||
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.
|
||||
|
||||
Contributor(s):
|
||||
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
|
||||
require_once "resources/require.php";
|
||||
require_once dirname(__DIR__, 2) . "/resources/require.php";
|
||||
require_once "resources/check_auth.php";
|
||||
|
||||
//check permissions
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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']);
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
|
|
@ -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)) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue