From bfbfca96e3a3cfd002cab9f4dad8697ae5b14590 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Fri, 26 Nov 2021 13:13:04 -0700
Subject: [PATCH] Use the new PHP auto_loader.php file.

---
 resources/require.php | 76 ++-----------------------------------------
 1 file changed, 2 insertions(+), 74 deletions(-)

diff --git a/resources/require.php b/resources/require.php
index ade0bd7a3b..e60c640b0b 100644
--- a/resources/require.php
+++ b/resources/require.php
@@ -28,7 +28,7 @@
 	include "root.php";
 
 //find and include the config.php file
-    $config_exists = false;
+	$config_exists = false;
 	if (file_exists("/etc/fusionpbx/config.php")) {
 		$config_exists = true;
 		include "/etc/fusionpbx/config.php";
@@ -43,79 +43,7 @@
 	}
 
 //class auto loader
-	if (!class_exists('auto_loader')) {
-		class auto_loader {
-			public function __construct() {
-				spl_autoload_register(array($this, 'loader'));
-			}
-			private function loader($class_name) {
-				//set the default value
-					$class_found = false;
-
-				//sanitize the class name
-					$class_name = preg_replace('[^a-zA-Z0-9_]', '', $class_name);
-
-				//save the log to the syslog server
-					if ($_REQUEST['debug'] == 'true') {
-						openlog("XML CDR", LOG_PID | LOG_PERROR, LOG_LOCAL0);
-					}
-
-				//find the most relevant class name
-					if (!$class_found && file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php")) {
-						//first priority
-						$path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php";
-						$class_found = true;
-						if ($_REQUEST['debug'] == 'true') {
-							syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__);
-						}
-						include $path;
-					}
-					elseif (!$class_found && file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/core/".$class_name."/resources/classes/".$class_name.".php")) {
-						//second priority
-						$path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/core/".$class_name."/resources/classes/".$class_name.".php";
-						$class_found = true;
-						if ($_REQUEST['debug'] == 'true') {
-							syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__);
-						}
-						include $path;
-					}
-					elseif (!$class_found && file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/app/".$class_name."/resources/classes/".$class_name.".php")) {
-						//third priority
-						$path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/app/".$class_name."/resources/classes/".$class_name.".php";
-						$class_found = true;
-						if ($_REQUEST['debug'] == 'true') {
-							syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__);
-						}
-						include $path;
-					}
-
-				//use glob for a more exensive search for the classes (note: GLOB_BRACE doesn't work on some systems)
-					if (!$class_found && !class_exists($class_name)) {
-						//fourth priority
-						$results_1 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/resources/classes/".$class_name.".php");
-						$results_2 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php");
-						$results = array_merge((array)$results_1,(array)$results_2);
-						unset($results_1, $results_2);
-						foreach ($results as &$class_file) {
-							if (!$class_found) {
-								$class_found = true;
-								if ($_REQUEST['debug'] == 'true') {
-									syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$class_file.", line: ".__line__);
-								}
-								include $class_file;
-								break;
-							}
-						}
-						unset($results);
-					}
-
-				//save the log to the syslog server
-					if ($_REQUEST['debug'] == 'true') {
-						closelog();
-					}
-			}
-		}
-	}
+	include "resources/classes/auto_loader.php";
 	$autoload = new auto_loader();
 
 //additional includes