mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 09:30:34 +01:00
Code Issues Releases Wiki Activity

[ticket/11150] Repositories settings - end

Browse Source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau 2015-09-15 11:57:09 +02:00 committed by Tristan Darricau
parent b75087a433
commit 8f1d254191
No known key found for this signature in database
GPG Key ID: 817043C2E29DB881
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/adm/style/acp_ext_gallery.html
View File

@ -35,7 +35,7 @@
</dl>
<dl>
<dt>
<label for="repositories">{{ lang('COMPOSER_REPOSITORIES') }}{{ lang('COLON') }}</label>
<label for="repositories">{{ lang('COMPOSER_REPOSITORIES') }}{{ lang('COLON') }}</label><br />
<span class="explain">
{{ lang('COMPOSER_REPOSITORIES_EXPLAIN') }}
</span>

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

@ -576,7 +576,7 @@ class acp_extensions
break;
case 'list':
default:
if ($this->request->is_set('enable_packagist') && confirm_box(true))
if (!$this->config['exts_composer_packagist'] && $this->request->is_set('enable_packagist') && confirm_box(true))
{
$this->config->set('exts_composer_packagist', true);
trigger_error($language->lang('CONFIG_UPDATED') . adm_back_link($this->u_action));
@ -593,11 +593,12 @@ class acp_extensions
$enable_packagist = $this->request->variable('enable_packagist', false);
$enable_on_install = $this->request->variable('enable_on_install', false);
$purge_on_remove = $this->request->variable('purge_on_remove', false);
//$repositories = $this->request->variable('repositories', []);
$repositories = array_unique(explode("\n", $this->request->variable('repositories', '')));
$this->config->set('exts_composer_enable_on_install', $enable_on_install);
$this->config->set('exts_composer_purge_on_remove', $purge_on_remove);
if ($enable_packagist)
$this->config->set('exts_composer_repositories', serialize($repositories));
if (!$this->config['exts_composer_packagist'] && $enable_packagist)
{
$s_hidden_fields = build_hidden_fields(array(
'enable_packagist' => $enable_packagist
@ -638,7 +639,7 @@ class acp_extensions
'enable_packagist' => $this->config['exts_composer_packagist'],
'enable_on_install' => $this->config['exts_composer_enable_on_install'],
'purge_on_remove' => $this->config['exts_composer_purge_on_remove'],
'repositories' => ['a', 'b', 'c'],//unserialize($this->config['exts_composer_repositories']),
'repositories' => unserialize($this->config['exts_composer_repositories']),
]);
$this->request->disable_super_globals();

3
phpBB/phpbb/composer/installer.php
View File

@ -83,9 +83,6 @@ class installer
$this->packages_vendor_dir = $config['exts_composer_vendor_dir'];
}
$this->repositories = [/*'http://phpbb.local/ext/phpbb/titania/composer/'*/];
$this->packagist = true;
$this->root_path = $root_path;
}