mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

This may be an interesting approach for internal functionality and trying to be consistent

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@9278 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2009-01-19 15:23:43 +00:00
parent 5a263f76a9
commit abee782518
3 changed files with 95 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
phpBB/plugins/bootstrap.php
View File

@@ -132,6 +132,16 @@ class phpbb_plugins
*/
private $current_plugin = false;
/**
* Plugins/Functions already set up
*/
private $already_parsed_plugins = array();
/**
* @var array Collection of assigned functions and their params (merged from plugins and custom additions)
*/
private $functions = array();
/**
* Init plugins
*
@@ -159,6 +169,8 @@ class phpbb_plugins
}
closedir($dh);
}
$this->already_parsed_plugins = array('plugin' => array(), 'hook' => array());
}
/**
@@ -196,13 +208,13 @@ class phpbb_plugins
*/
public function setup()
{
if (empty($this->plugins))
{
return false;
}
foreach ($this->plugins as $name => $plugin)
{
if (isset($this->already_parsed_plugins['plugin'][$name]))
{
continue;
}
// Add includes
foreach ($plugin->includes as $file)
{
@@ -244,29 +256,45 @@ class phpbb_plugins
// Setup/Register plugin...
$object->setup_plugin($instance);
}
}
// Now setup hooks... this is a special case...
foreach ($plugin->functions as $params)
// Now setup hooks... this is a special case...
foreach ($this->functions as $key => $params)
{
if (isset($this->already_parsed_plugins['hook'][$key]))
{
$function = array_shift($params);
$hook = array_shift($params);
$mode = (!empty($params)) ? array_shift($params) : phpbb::FUNCTION_INJECT;
$action = (!empty($params)) ? array_shift($params) : 'default';
continue;
}
// Check if the function is already overridden.
if ($mode == phpbb::FUNCTION_OVERRIDE && isset($this->hooks[$function][$mode]))
{
trigger_error('Function ' . $function . ' is already overridden by ' . $this->hooks[$function][$mode] . '.', E_USER_ERROR);
}
$function = array_shift($params);
$hook = array_shift($params);
$mode = (!empty($params)) ? array_shift($params) : phpbb::FUNCTION_INJECT;
$action = (!empty($params)) ? array_shift($params) : 'default';
if ($mode == phpbb::FUNCTION_OVERRIDE)
{
$this->hooks[$function][$mode] = $hook;
}
else
{
$this->hooks[$function][$mode][$action][] = $hook;
}
// Check if the function is already overridden.
if ($mode == phpbb::FUNCTION_OVERRIDE && isset($this->hooks[$function][$mode]))
{
trigger_error('Function ' . $function . ' is already overridden by ' . $this->hooks[$function][$mode] . '.', E_USER_ERROR);
}
if ($mode == phpbb::FUNCTION_OVERRIDE)
{
$this->hooks[$function][$mode] = $hook;
}
else
{
$this->hooks[$function][$mode][$action][] = $hook;
}
$this->already_parsed_plugins['hook'][$key] = true;
}
// Init method call and setting as finished
foreach ($this->plugins as $name => $plugin)
{
if (isset($this->already_parsed_plugins['plugin'][$name]))
{
continue;
}
// Call plugins init method?
@@ -274,6 +302,8 @@ class phpbb_plugins
{
$plugin->setup->init();
}
$this->already_parsed_plugins['plugin'][$name] = true;
}
}
@@ -332,7 +362,7 @@ class phpbb_plugins
public function register_function()
{
$arguments = func_get_args();
$this->current_plugin->functions[] = $arguments;
$this->current_plugin->functions[] = $this->functions[] = $arguments;
}
/**