makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/extension-manager] Always store the full class name as module basename

Browse source 
The updater swaps out all basenames.

PHPBB3-10323
This commit is contained in:
Nils Adermann 2011-08-29 20:54:42 -04:00
parent c785ef7aa7
commit fe4b8818ec
2 changed files with 41 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/includes/functions_module.php
View file

@ -441,18 +441,19 @@ class p_master
} }
// new modules use the full class names, old ones are always called <type>_<name>, e.g. acp_board // new modules use the full class names, old ones are always called <type>_<name>, e.g. acp_board
if (!class_exists($this->p_name) && !class_exists("{$this->p_class}_$this->p_name")) if (!class_exists($this->p_name))
{ {
if (!file_exists("$module_path/{$this->p_class}_$this->p_name.$phpEx")) if (!file_exists("$module_path/{$this->p_name}.$phpEx"))
{ {
trigger_error("Cannot find module $module_path/{$this->p_class}_$this->p_name.$phpEx", E_USER_ERROR);
trigger_error("Cannot find module $module_path/{$this->p_name}.$phpEx", E_USER_ERROR);
} }
include("$module_path/{$this->p_class}_$this->p_name.$phpEx"); include("$module_path/{$this->p_name}.$phpEx");
if (!class_exists("{$this->p_class}_$this->p_name")) if (!class_exists($this->p_name))
{ {
trigger_error("Module file $module_path/{$this->p_class}_$this->p_name.$phpEx does not contain correct class [{$this->p_class}_$this->p_name]", E_USER_ERROR); trigger_error("Module file $module_path/{$this->p_name}.$phpEx does not contain correct class [{$this->p_name}]", E_USER_ERROR);
} }
} }
@ -462,7 +463,7 @@ class p_master
} }
// Create a new instance of the desired module ... // Create a new instance of the desired module ...
$class_name = (class_exists($this->p_name)) ? $this->p_name : "{$this->p_class}_$this->p_name"; $class_name = $this->p_name;
$this->module = new $class_name($this); $this->module = new $class_name($this);

35
phpBB/install/database_update.php
View file

@ -2115,6 +2115,37 @@ function change_database_data(&$no_updates, $version)
// Changes from 3.1.0-dev to 3.1.0-A1 // Changes from 3.1.0-dev to 3.1.0-A1
case '3.1.0-dev': case '3.1.0-dev':
// rename all module basenames to full classname
$sql = 'SELECT module_id, module_basename, module_class
FROM ' . MODULES_TABLE;
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
$module_id = (int) $row['module_id'];
unset($row['module_id']);
if (!empty($row['module_basename']) && !empty($row['module_class']))
{
// all the class names start with class name or with phpbb_ for auto loading
if (strpos($row['module_basename'], $row['module_class'] . '_') !== 0 &&
strpos($row['module_basename'], 'phpbb_') !== 0)
{
$row['module_basename'] = $row['module_class'] . '_' . $row['module_basename'];
$sql_update = $db->sql_build_array('UPDATE', $row);
$sql = 'UPDATE ' . MODULES_TABLE . '
SET ' . $sql_update . '
WHERE module_id = ' . $module_id;
_sql($sql, $errored, $error_ary);
}
}
}
$db->sql_freeresult($result);
// try to guess the new auto loaded search class name // try to guess the new auto loaded search class name
// works for native and mysql fulltext // works for native and mysql fulltext
set_config('search_type', 'phpbb_search_' . $config['search_type']); set_config('search_type', 'phpbb_search_' . $config['search_type']);
@ -2159,14 +2190,14 @@ function change_database_data(&$no_updates, $version)
// Install modules // Install modules
$modules_to_install = array( $modules_to_install = array(
'position' => array( 'position' => array(
'base' => 'groups', 'base' => 'acp_groups',
'class' => 'acp', 'class' => 'acp',
'title' => 'ACP_GROUPS_POSITION', 'title' => 'ACP_GROUPS_POSITION',
'auth' => 'acl_a_group', 'auth' => 'acl_a_group',
'cat' => 'ACP_GROUPS', 'cat' => 'ACP_GROUPS',
), ),
'manage' => array( 'manage' => array(
'base' => 'attachments', 'base' => 'acp_attachments',
'class' => 'acp', 'class' => 'acp',
'title' => 'ACP_MANAGE_ATTACHMENTS', 'title' => 'ACP_MANAGE_ATTACHMENTS',
'auth' => 'acl_a_attach', 'auth' => 'acl_a_attach',