X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=include%2Fautoload.php;h=1f1dbe5e993ff7bc9218e1fd55dd6382c560330e;hb=e2b8c9273e09091c235959c25d8e4d8122aa6ca8;hp=505b4447721ea2829965b566cad24b9c40fbd023;hpb=52af297e745f5b5c101c642c45e08d268aa324d8;p=tt-rss.git

diff --git a/include/autoload.php b/include/autoload.php
index 505b4447..1f1dbe5e 100644
--- a/include/autoload.php
+++ b/include/autoload.php
@@ -1,14 +1,26 @@
 <?php
 	require_once "functions.php";
 
-	function __autoload($class) {
-		$class_file = str_replace("_", "/", strtolower(basename($class)));
+	spl_autoload_register(function($class) {
+		$namespace = '';
+		$class_name = $class;
 
-		$file = dirname(__FILE__)."/../classes/$class_file.php";
+		if (strpos($class, '\\') !== FALSE)
+			list ($namespace, $class_name) = explode('\\', $class, 2);
 
-		if (file_exists($file)) {
-			require $file;
+		$root_dir = dirname(__DIR__); // we're in tt-rss/include
+
+		// 1. third party libraries with namespaces are loaded from vendor/
+		// 2. internal tt-rss classes are loaded from classes/ and use special naming logic instead of namespaces
+		// 3. plugin classes are loaded by PluginHandler from plugins.local/ and plugins/ (TODO: use generic autoloader?)
+
+		if ($namespace && $class_name) {
+			$class_file = "$root_dir/vendor/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
+		} else {
+			$class_file = "$root_dir/classes/" . str_replace("_", "/", strtolower($class)) . ".php";
 		}
 
-	}
-?>
+		if (file_exists($class_file))
+			include $class_file;
+
+	});