Эх сурвалжийг харах

Use __dir__ to find resources/require.php

markjcrane 2 жил өмнө
parent
commit
73083ed6cf

+ 3 - 3
core/events/resources/classes/events.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";

+ 0 - 4
core/groups/permissions_default.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";

+ 0 - 5
core/install/install.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');
 

+ 2 - 6
core/menu/menu_reload.php

@@ -17,19 +17,15 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <[email protected]>
-	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 <[email protected]>
 */
 
-//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

+ 0 - 4
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";

+ 1 - 5
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";

+ 2 - 4
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);

+ 4 - 6
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;
 	}

+ 3 - 0
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']);

+ 3 - 7
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();
 

+ 2 - 10
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)) {