fixes #801, fixes #620 - implement autoloader; remove require_once

FrontController.php from ./index.php to test autoloader; add "false" 
parameter to all class_exists() calls to not trigger autoloader

1 files changed, 40 insertions, 2 deletions

diff --git a/piwik.php b/piwik.php
index f03762dfab..3a07e74037 100644
--- a/piwik.php
+++ b/piwik.php
@@ -18,12 +18,51 @@ error_reporting(E_ALL|E_NOTICE);
 define('PIWIK_INCLUDE_PATH', dirname(__FILE__));
 @ignore_user_abort(true);
 
-if((@include "Version.php") === false || !class_exists('Piwik_Version')) {
+if((@include "Version.php") === false || !class_exists('Piwik_Version', false))
+{
 	set_include_path(PIWIK_INCLUDE_PATH . '/core'
 		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs'
 		. PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins');
 }
 
+function piwikAutoloader($class)
+{
+	$class = str_replace('_', '/', $class) . '.php';
+	if(substr($class, 0, 6) === 'Piwik/')
+	{
+		$class = substr($class, 6);
+		if(file_exists(PIWIK_INCLUDE_PATH . "/core/" . $class))
+		{
+			include_once PIWIK_INCLUDE_PATH . "/core/" . $class;
+		}
+		else
+		{
+			include_once PIWIK_INCLUDE_PATH . "/plugins/" . $class;
+		}
+	}
+	else
+	{
+		include_once PIWIK_INCLUDE_PATH . "/libs/" . $class;
+	}
+}
+
+// Note: only one __autoload per PHP instance
+if(function_exists('spl_autoload_register'))
+{
+	spl_autoload_register('piwikAutoloader'); // use the SPL autoload stack
+	if(function_exists('__autoload'))
+	{
+		spl_auto_register('__autoload');
+	}
+}
+else
+{
+	function __autoload($class)
+	{
+		piwikAutoloader($class);
+	}
+}
+
 require_once "Common.php";
 require_once "PluginsManager.php";
 require_once "Tracker.php";
@@ -53,4 +92,3 @@ $process = new Piwik_Tracker;
 $process->main();
 ob_end_flush();
 printDebug($_COOKIE);
-