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

[ticket/12043] Correct try/catch exceptions for invalid extensions

Browse source 
PHPBB3-12043
This commit is contained in:
Matt Friedman 2014-03-29 11:09:27 -07:00
parent bf2aca6f8b
commit 2024c5adc2
1 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
phpBB/includes/acp/acp_extensions.php
View file

@ -247,24 +247,9 @@ class acp_extensions
{ {
$md_manager = $phpbb_extension_manager->create_extension_metadata_manager($name, $this->template); $md_manager = $phpbb_extension_manager->create_extension_metadata_manager($name, $this->template);
$enabled_extension_meta_data[$name] = $md_manager->get_metadata('display-name');
}
natcasesort($enabled_extension_meta_data);
foreach ($enabled_extension_meta_data as $name => $display_name)
{
try try
{ {
$this->template->assign_block_vars('enabled', array( $enabled_extension_meta_data[$name] = $md_manager->get_metadata('display-name');
'META_DISPLAY_NAME' => $display_name,
'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . urlencode($name),
));
$this->output_actions('enabled', array(
'DISABLE' => $this->u_action . '&action=disable_pre&ext_name=' . urlencode($name),
));
} }
catch(\phpbb\extension\exception $e) catch(\phpbb\extension\exception $e)
{ {
@ -273,6 +258,21 @@ class acp_extensions
)); ));
} }
} }
natcasesort($enabled_extension_meta_data);
foreach ($enabled_extension_meta_data as $name => $display_name)
{
$this->template->assign_block_vars('enabled', array(
'META_DISPLAY_NAME' => $display_name,
'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . urlencode($name),
));
$this->output_actions('enabled', array(
'DISABLE' => $this->u_action . '&action=disable_pre&ext_name=' . urlencode($name),
));
}
} }
/** /**
@ -289,25 +289,9 @@ class acp_extensions
{ {
$md_manager = $phpbb_extension_manager->create_extension_metadata_manager($name, $this->template); $md_manager = $phpbb_extension_manager->create_extension_metadata_manager($name, $this->template);
$disabled_extension_meta_data[$name] = $md_manager->get_metadata('display-name');
}
natcasesort($disabled_extension_meta_data);
foreach ($disabled_extension_meta_data as $name => $display_name)
{
try try
{ {
$this->template->assign_block_vars('disabled', array( $disabled_extension_meta_data[$name] = $md_manager->get_metadata('display-name');
'META_DISPLAY_NAME' => $display_name,
'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . urlencode($name),
));
$this->output_actions('disabled', array(
'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name),
'DELETE_DATA' => $this->u_action . '&action=delete_data_pre&ext_name=' . urlencode($name),
));
} }
catch(\phpbb\extension\exception $e) catch(\phpbb\extension\exception $e)
{ {
@ -316,6 +300,22 @@ class acp_extensions
)); ));
} }
} }
natcasesort($disabled_extension_meta_data);
foreach ($disabled_extension_meta_data as $name => $display_name)
{
$this->template->assign_block_vars('disabled', array(
'META_DISPLAY_NAME' => $display_name,
'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . urlencode($name),
));
$this->output_actions('disabled', array(
'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name),
'DELETE_DATA' => $this->u_action . '&action=delete_data_pre&ext_name=' . urlencode($name),
));
}
} }
/** /**
@ -334,24 +334,9 @@ class acp_extensions
{ {
$md_manager = $phpbb_extension_manager->create_extension_metadata_manager($name, $this->template); $md_manager = $phpbb_extension_manager->create_extension_metadata_manager($name, $this->template);
$available_extension_meta_data[$name] = $md_manager->get_metadata('display-name');
}
natcasesort($available_extension_meta_data);
foreach ($available_extension_meta_data as $name => $display_name)
{
try try
{ {
$this->template->assign_block_vars('disabled', array( $available_extension_meta_data[$name] = $md_manager->get_metadata('display-name');
'META_DISPLAY_NAME' => $display_name,
'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . urlencode($name),
));
$this->output_actions('disabled', array(
'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name),
));
} }
catch(\phpbb\extension\exception $e) catch(\phpbb\extension\exception $e)
{ {
@ -360,6 +345,21 @@ class acp_extensions
)); ));
} }
} }
natcasesort($available_extension_meta_data);
foreach ($available_extension_meta_data as $name => $display_name)
{
$this->template->assign_block_vars('disabled', array(
'META_DISPLAY_NAME' => $display_name,
'U_DETAILS' => $this->u_action . '&action=details&ext_name=' . urlencode($name),
));
$this->output_actions('disabled', array(
'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name),
));
}
} }
/** /**