[ticket/10631] Fixing some extension admin issues found

PHPBB3-10631
This commit is contained in:
Michael Cullum 2012-03-09 18:19:21 +00:00 committed by Unknown Bliss
parent e768d0066d
commit 3a5843959c

View file

@ -60,8 +60,7 @@ class acp_extensions
break; break;
case 'enable': case 'enable':
$name = $request->variable('ext_name', ''); $this->enable_extension($ext_name);
$this->enable_extension($name);
$this->tpl_name = 'acp_ext_enable'; $this->tpl_name = 'acp_ext_enable';
break; break;
@ -75,8 +74,7 @@ class acp_extensions
break; break;
case 'disable': case 'disable':
$name = $request->variable('ext_name', ''); $this->disable_extension($ext_name);
$this->disable_extension($name);
$this->tpl_name = 'acp_ext_disable'; $this->tpl_name = 'acp_ext_disable';
break; break;
@ -90,8 +88,7 @@ class acp_extensions
break; break;
case 'purge': case 'purge':
$name = $request->variable('ext_name', ''); $this->purge_extension($ext_name);
$this->purge_extension($name);
$this->tpl_name = 'acp_ext_purge'; $this->tpl_name = 'acp_ext_purge';
break; break;
@ -105,20 +102,18 @@ class acp_extensions
break; break;
case 'delete': case 'delete':
$name = $request->variable('ext_name', '');
$this->tpl_name = 'acp_ext_delete'; $this->tpl_name = 'acp_ext_delete';
break; break;
case 'details': case 'details':
$name = $request->variable('ext_name', ''); $filepath = $phpbb_root_path . 'ext/' . $ext_name . '/extension.json';
$filepath = $phpbb_root_path . 'ext/' . $name . '/extension.json';
$this->tpl_name = 'acp_ext_details'; $this->tpl_name = 'acp_ext_details';
$this->get_meta_info($filepath); $this->get_meta_info($filepath);
break; break;
} }
} }
function enable_extension($name) function enable_extension($ext_name)
{ {
global $phpbb_extension_manager, $template, $cache; global $phpbb_extension_manager, $template, $cache;
@ -129,7 +124,7 @@ class acp_extensions
$cache->purge(); $cache->purge();
} }
function disable_extension($name) function disable_extension($ext_name)
{ {
global $phpbb_extension_manager, $template, $cache; global $phpbb_extension_manager, $template, $cache;
$phpbb_extension_manager->disable($name); $phpbb_extension_manager->disable($name);
@ -139,7 +134,7 @@ class acp_extensions
$cache->purge(); $cache->purge();
} }
function purge_extension($name) function purge_extension($ext_name)
{ {
global $phpbb_extension_manager, $template, $cache; global $phpbb_extension_manager, $template, $cache;
$phpbb_extension_manager->purge($name); $phpbb_extension_manager->purge($name);
@ -198,12 +193,12 @@ class acp_extensions
return; return;
} }
function list_avaliable_exts() function list_available_exts()
{ {
$phpbb_extension_manager->load_extensions(); $phpbb_extension_manager->load_extensions();
$allavailable = array_keys($phpbb_extension_manager->all_available()); $all_available = array_keys($phpbb_extension_manager->all_available());
$allconfigured = array_keys($phpbb_extension_manager->all_configured()); $all_configured = array_keys($phpbb_extension_manager->all_configured());
$uninstalled = array_diff($allavailable, $allconfigured); $uninstalled = array_diff($all_available, $all_configured);
foreach ($uninstalled as $ext) foreach ($uninstalled as $ext)
{ {