mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-13 18:04:06 +02:00
Code Issues Releases Wiki Activity

[ticket/12777] Rename extension status functions and add is_configured()

Browse Source 
PHPBB3-12777
This commit is contained in:
Tristan Darricau
2014-06-27 10:49:13 +02:00
parent 9b27d00d5f
commit d13e02c7b1
5 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,7 @@ class acp_extensions
trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
if ($phpbb_extension_manager->enabled($ext_name)) if ($phpbb_extension_manager->is_enabled($ext_name))
{ {
redirect($this->u_action); redirect($this->u_action);
} }
@ -162,7 +162,7 @@ class acp_extensions
trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
if ($phpbb_extension_manager->enabled($ext_name)) if ($phpbb_extension_manager->is_enabled($ext_name))
{ {
redirect($this->u_action); redirect($this->u_action);
} }
@ -194,7 +194,7 @@ class acp_extensions
break; break;
case 'disable_pre': case 'disable_pre':
if (!$phpbb_extension_manager->enabled($ext_name)) if (!$phpbb_extension_manager->is_enabled($ext_name))
{ {
redirect($this->u_action); redirect($this->u_action);
} }
@ -209,7 +209,7 @@ class acp_extensions
break; break;
case 'disable': case 'disable':
if (!$phpbb_extension_manager->enabled($ext_name)) if (!$phpbb_extension_manager->is_enabled($ext_name))
{ {
redirect($this->u_action); redirect($this->u_action);
} }
@ -234,7 +234,7 @@ class acp_extensions
break; break;
case 'delete_data_pre': case 'delete_data_pre':
if ($phpbb_extension_manager->enabled($ext_name)) if ($phpbb_extension_manager->is_enabled($ext_name))
{ {
redirect($this->u_action); redirect($this->u_action);
} }
@ -248,7 +248,7 @@ class acp_extensions
break; break;
case 'delete_data': case 'delete_data':
if ($phpbb_extension_manager->enabled($ext_name)) if ($phpbb_extension_manager->is_enabled($ext_name))
{ {
redirect($this->u_action); redirect($this->u_action);
} }

2
phpBB/phpbb/console/command/extension/disable.php
View File

@ -37,7 +37,7 @@ class disable extends command
$this->manager->disable($name); $this->manager->disable($name);
$this->manager->load_extensions(); $this->manager->load_extensions();
if ($this->manager->enabled($name)) if ($this->manager->is_enabled($name))
{ {
$output->writeln("<error>Could not disable extension $name</error>"); $output->writeln("<error>Could not disable extension $name</error>");
return 1; return 1;

2
phpBB/phpbb/console/command/extension/enable.php
View File

@ -37,7 +37,7 @@ class enable extends command
$this->manager->enable($name); $this->manager->enable($name);
$this->manager->load_extensions(); $this->manager->load_extensions();
if ($this->manager->enabled($name)) if ($this->manager->is_enabled($name))
{ {
$this->log->add('admin', ANONYMOUS, '', 'LOG_EXTENSION_ENABLE', time(), array($name)); $this->log->add('admin', ANONYMOUS, '', 'LOG_EXTENSION_ENABLE', time(), array($name));
$output->writeln("<info>Successfully enabled extension $name</info>"); $output->writeln("<info>Successfully enabled extension $name</info>");

2
phpBB/phpbb/console/command/extension/purge.php
View File

@ -37,7 +37,7 @@ class purge extends command
$this->manager->purge($name); $this->manager->purge($name);
$this->manager->load_extensions(); $this->manager->load_extensions();
if ($this->manager->enabled($name)) if ($this->manager->is_enabled($name))
{ {
$output->writeln("<error>Could not purge extension $name</error>"); $output->writeln("<error>Could not purge extension $name</error>");
return 1; return 1;

27
phpBB/phpbb/extension/manager.php
View File

@ -515,7 +515,7 @@ class manager
* @param string $name Extension name to check NOTE: Can be user input * @param string $name Extension name to check NOTE: Can be user input
* @return bool Depending on whether or not the extension is available * @return bool Depending on whether or not the extension is available
*/ */
public function available($name) public function is_available($name)
{ {
return file_exists($this->get_extension_path($name, true)); return file_exists($this->get_extension_path($name, true));
} }
@ -526,11 +526,34 @@ class manager
* @param string $name Extension name to check * @param string $name Extension name to check
* @return bool Depending on whether or not the extension is enabled * @return bool Depending on whether or not the extension is enabled
*/ */
public function enabled($name) public function is_enabled($name)
{ {
return isset($this->extensions[$name]) && $this->extensions[$name]['ext_active']; return isset($this->extensions[$name]) && $this->extensions[$name]['ext_active'];
} }
/**
* Check to see if a given extension is disabled
*
* @param string $name Extension name to check
* @return bool Depending on whether or not the extension is disabled
*/
public function is_disabled($name)
{
return isset($this->extensions[$name]) && !$this->extensions[$name]['ext_active'];
}
/**
* Check to see if a given extension is configured
*
* @param string $name Extension name to check
* @return bool Depending on whether or not the extension is configured
* @see all_configured()
*/
public function is_configured($name)
{
return isset($this->extensions[$name]);
}
/** /**
* Instantiates a \phpbb\finder. * Instantiates a \phpbb\finder.
* *