Implement addon manager class, addons now have to register their call…

…backs.

include/addons.php

@@ -10,39 +10,55 @@
 if (!defined('PUN'))
 	exit;
 
-$flux_addons = array();
-$flux_addons_loaded = false;
+$flux_addons = new flux_addon_manager();
 
-function flux_addons_load()
+
+class flux_addon_manager
 {
-	global $flux_addons, $flux_addons_loaded;
+	var $hooks = array();
+
+	var $loaded = false;
 
-	foreach (glob(PUN_ROOT.'addons/*.php') as $addon_file)
+	function load()
 	{
-		$addon_name = 'addon_'.basename($addon_file, '.php');
-		include $addon_file;
+		$this->loaded = true;
 
-		$flux_addons[] = new $addon_name;
-	}
+		foreach (glob(PUN_ROOT.'addons/*.php') as $addon_file)
+		{
+			$addon_name = 'addon_'.basename($addon_file, '.php');
 
-	$flux_addons_loaded = true;
-}
+			include $addon_file;
+			$addon = new $addon_name;
 
-function flux_hook($name)
-{
-	global $flux_addons, $flux_addons_loaded;
+			$addon->register($this);
+		}
+	}
+
+	function bind($hook, $callback)
+	{
+		if (!isset($this->hooks[$hook]))
+			$this->hooks[$hook] = array();
 
-	if (!$flux_addons_loaded)
-		flux_addons_load();
+		$this->hooks[$hook][] = $callback;
+	}
 
-	// Give every plugin the chance to run some code specific for this hook
-	foreach ($flux_addons as $addon)
+	function hook($name)
 	{
-		$hook = 'hook_'.$name;
-		$addon->$hook();
+		if (!$this->loaded)
+			$this->load();
+
+		$callbacks = isset($this->hooks[$name]) ? $this->hooks[$name] : array();
+
+		// Execute every registered callback for this hook
+		foreach ($callbacks as $callback)
+		{
+			list($addon, $method) = $callback;
+			$addon->$method();
+		}
 	}
 }
 
+
 /**
  * Class flux_addon
  *
@@ -51,9 +67,6 @@ function flux_hook($name)
  */
 class flux_addon
 {
-	function hook_register_validate()
-	{ }
-
-	function hook_register_pre_submit()
+	function register($manager)
 	{ }
 }

include/functions.php

@@ -670,6 +670,17 @@ function get_tracked_topics()
 }
 
 
+//
+// Shortcut method for executing all callbacks registered with the addon manager for the given hook
+//
+function flux_hook($name)
+{
+	global $flux_addons;
+
+	$flux_addons->hook($name);
+}
+
+
 //
 // Update posts, topics, last_post, last_post_id and last_poster for a forum
 //