mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-30 11:40:08 +02:00
Code Issues Releases Wiki Activity

[ticket/14492] Use extension manager instead of finder and add try/catch

Browse Source 
PHPBB3-14492
This commit is contained in:
Marc Alexander
2016-03-03 22:26:29 +01:00
parent 88f197e67a
commit e308093d75
2 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
phpBB/phpbb/install/module/install_finish/task/install_extensions.php
View File

@@ -102,18 +102,17 @@ class install_extensions extends \phpbb\install\task_base
$install_extensions = $this->iohandler->get_input('install-extensions', array());
// Find available extensions
foreach ($this->finder as $file)
{
/** @var \SplFileInfo $file */
$ext_name = preg_replace('#(.+[\\/\\\]ext[\\/\\\])(\w+)[\\/\\\](\w+)#', '$2/$3', dirname($file->getRealPath()));
$available_extensions = $this->extension_manager->all_available();
// Install extensions
foreach ($available_extensions as $ext_name => $ext_path)
{
if (!empty($install_extensions) && !in_array($ext_name, $install_extensions))
{
continue;
}
if ($this->extension_manager->is_available($ext_name))
try
{
$this->extension_manager->enable($ext_name);
$extensions = $this->get_extensions();
@@ -122,12 +121,18 @@ class install_extensions extends \phpbb\install\task_base
{
// Create log
$this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_ENABLE', time(), array($ext_name));
$this->iohandler->add_success_message(array('CLI_EXTENSION_ENABLE_SUCCESS', $ext_name));
}
else
{
$this->iohandler->add_log_message(array('CLI_EXTENSION_ENABLE_FAILURE', $ext_name));
}
}
catch (\Exception $e)
{
// Add fail log and continue
$this->iohandler->add_log_message(array('CLI_EXTENSION_ENABLE_FAILURE', $ext_name));
}
}
}