mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 03:34:04 +02:00
Code Issues Releases Wiki Activity

[ticket/10631] Functional acp_extensions test, cleanup

Browse Source 
PHPBB3-10631
This commit is contained in:
Nathan Guse
2012-07-29 20:08:30 -05:00
committed by Unknown Bliss
parent 500879520c
commit 36465c9a20
8 changed files with 481 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/adm/style/acp_ext_list.html
View File

@@ -23,7 +23,7 @@
</td>
</tr>
<!-- BEGIN enabled -->
<tr>
<tr class="ext_enabled">
<td><strong>{enabled.EXT_NAME}</strong></a></td>
<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
<td style="text-align: center;">
@@ -41,7 +41,7 @@
<td class="row3" colspan="3"><strong>{L_DISABLED} {L_EXTENSIONS}</strong></td>
</tr>
<!-- BEGIN disabled -->
<tr>
<tr class="ext_disabled">
<td><strong>{disabled.EXT_NAME}</strong></a></td>
<td style="text-align: center;">
<!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF -->

38
phpBB/includes/acp/acp_extensions.php
View File

@@ -72,7 +72,7 @@ class acp_extensions
break;
case 'enable_pre':
if (!$md_manager->validate_enable())
if (!$md_manager->validate_enable() || $phpbb_extension_manager->enabled($ext_name))
{
trigger_error('EXTENSION_NOT_AVAILABLE');
}
@@ -81,7 +81,7 @@ class acp_extensions
$template->assign_vars(array(
'PRE' => true,
'U_ENABLE' => $this->u_action . '&amp;action=enable&amp;ext_name=' . $ext_name,
'U_ENABLE' => $this->u_action . '&amp;action=enable&amp;ext_name=' . urlencode($ext_name),
));
break;
@@ -95,7 +95,7 @@ class acp_extensions
{
$template->assign_var('S_NEXT_STEP', true);
meta_refresh(0, $this->u_action . '&amp;action=enable&amp;ext_name=' . $ext_name);
meta_refresh(0, $this->u_action . '&amp;action=enable&amp;ext_name=' . urlencode($ext_name));
}
$this->tpl_name = 'acp_ext_enable';
@@ -106,11 +106,16 @@ class acp_extensions
break;
case 'disable_pre':
if (!$phpbb_extension_manager->enabled($ext_name))
{
trigger_error('EXTENSION_NOT_AVAILABLE');
}
$this->tpl_name = 'acp_ext_disable';
$template->assign_vars(array(
'PRE' => true,
'U_DISABLE' => $this->u_action . '&amp;action=disable&amp;ext_name=' . $ext_name,
'U_DISABLE' => $this->u_action . '&amp;action=disable&amp;ext_name=' . urlencode($ext_name),
));
break;
@@ -119,7 +124,7 @@ class acp_extensions
{
$template->assign_var('S_NEXT_STEP', true);
meta_refresh(0, $this->u_action . '&amp;action=disable&amp;ext_name=' . $ext_name);
meta_refresh(0, $this->u_action . '&amp;action=disable&amp;ext_name=' . urlencode($ext_name));
}
$this->tpl_name = 'acp_ext_disable';
@@ -134,7 +139,7 @@ class acp_extensions
$template->assign_vars(array(
'PRE' => true,
'U_PURGE' => $this->u_action . '&amp;action=purge&amp;ext_name=' . $ext_name,
'U_PURGE' => $this->u_action . '&amp;action=purge&amp;ext_name=' . urlencode($ext_name),
));
break;
@@ -143,7 +148,7 @@ class acp_extensions
{
$template->assign_var('S_NEXT_STEP', true);
meta_refresh(0, $this->u_action . '&amp;action=purge&amp;ext_name=' . $ext_name);
meta_refresh(0, $this->u_action . '&amp;action=purge&amp;ext_name=' . urlencode($ext_name));
}
$this->tpl_name = 'acp_ext_purge';
@@ -166,7 +171,6 @@ class acp_extensions
* Lists all the enabled extensions and dumps to the template
*
* @param $phpbb_extension_manager An instance of the extension manager
* @param $template An instance of the template engine
* @return null
*/
public function list_enabled_exts(phpbb_extension_manager $phpbb_extension_manager)
@@ -180,12 +184,12 @@ class acp_extensions
$this->template->assign_block_vars('enabled', array(
'EXT_NAME' => $md_manager->get_metadata('display-name'),
'U_DETAILS' => $this->u_action . '&amp;action=details&amp;ext_name=' . $name,
'U_DETAILS' => $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name),
));
$this->output_actions('enabled', array(
'DISABLE' => $this->u_action . '&amp;action=disable_pre&amp;ext_name=' . $name,
'PURGE' => $this->u_action . '&amp;action=purge_pre&amp;ext_name=' . $name,
'DISABLE' => $this->u_action . '&amp;action=disable_pre&amp;ext_name=' . urlencode($name),
'PURGE' => $this->u_action . '&amp;action=purge_pre&amp;ext_name=' . urlencode($name),
));
}
catch(phpbb_extension_exception $e)
@@ -201,7 +205,6 @@ class acp_extensions
* Lists all the disabled extensions and dumps to the template
*
* @param $phpbb_extension_manager An instance of the extension manager
* @param $template An instance of the template engine
* @return null
*/
public function list_disabled_exts(phpbb_extension_manager $phpbb_extension_manager)
@@ -215,12 +218,12 @@ class acp_extensions
$this->template->assign_block_vars('disabled', array(
'EXT_NAME' => $md_manager->get_metadata('display-name'),
'U_DETAILS' => $this->u_action . '&amp;action=details&amp;ext_name=' . $name,
'U_DETAILS' => $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name),
));
$this->output_actions('disabled', array(
'ENABLE' => $this->u_action . '&amp;action=enable_pre&amp;ext_name=' . $name,
'PURGE' => $this->u_action . '&amp;action=purge_pre&amp;ext_name=' . $name,
'ENABLE' => $this->u_action . '&amp;action=enable_pre&amp;ext_name=' . urlencode($name),
'PURGE' => $this->u_action . '&amp;action=purge_pre&amp;ext_name=' . urlencode($name),
));
}
catch(phpbb_extension_exception $e)
@@ -236,7 +239,6 @@ class acp_extensions
* Lists all the available extensions and dumps to the template
*
* @param $phpbb_extension_manager An instance of the extension manager
* @param $template An instance of the template engine
* @return null
*/
public function list_available_exts(phpbb_extension_manager $phpbb_extension_manager)
@@ -252,11 +254,11 @@ class acp_extensions
$this->template->assign_block_vars('disabled', array(
'EXT_NAME' => $md_manager->get_metadata('display-name'),
'U_DETAILS' => $this->u_action . '&amp;action=details&amp;ext_name=' . $name,
'U_DETAILS' => $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name),
));
$this->output_actions('disabled', array(
'ENABLE' => $this->u_action . '&amp;action=enable_pre&amp;ext_name=' . $name,
'ENABLE' => $this->u_action . '&amp;action=enable_pre&amp;ext_name=' . urlencode($name),
));
}
catch(phpbb_extension_exception $e)