makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11150] Add comments + ignore invaid repositories URLs

Browse source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau 2017-04-06 20:14:46 +02:00
parent fbf11d61aa
commit d59b26dcec
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
4 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/style/acp_ext_catalog.html
View file

@ -7,7 +7,7 @@
<p>{{ lang( 'EXTENSIONS_CATALOG_EXPLAIN') }}</p> <p>{{ lang( 'EXTENSIONS_CATALOG_EXPLAIN') }}</p>
<fieldset class="quick quick-left"> <fieldset class="quick quick-left">
<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.1" target="_blank">{{ lang('BROWSE_EXTENSIONS_DATABASE') }}</a> &bull; <a href="javascript:phpbb.toggleDisplay('catalog_settings');">{{ lang('SETTINGS') }}</a></span> <span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.2" target="_blank">{{ lang('BROWSE_EXTENSIONS_DATABASE') }}</a> &bull; <a href="javascript:phpbb.toggleDisplay('catalog_settings');">{{ lang('SETTINGS') }}</a></span>
</fieldset> </fieldset>
{% if pagination is defined %} {% if pagination is defined %}

6
phpBB/includes/acp/acp_extensions.php
View file

@ -416,6 +416,12 @@ class acp_extensions
$this->tpl_name = $tpl_name; $this->tpl_name = $tpl_name;
} }
/**
* Handles the catalog mode of the extensions list
*
* @param string $id
* @param string $mode
*/
public function catalog_mode($id, $mode) public function catalog_mode($id, $mode)
{ {
global $phpbb_container; global $phpbb_container;

11
phpBB/phpbb/composer/installer.php
View file

@ -599,10 +599,13 @@ class installer
foreach ($this->repositories as $repository) foreach ($this->repositories as $repository)
{ {
$repositories[] = [ if (preg_match('#^' . get_preg_expression('url') . '$#iu', $repository))
'type' => 'composer', {
'url' => $repository, $repositories[] = [
]; 'type' => 'composer',
'url' => $repository,
];
}
} }
return $repositories; return $repositories;

12
phpBB/phpbb/composer/manager.php
View file

@ -291,6 +291,18 @@ class manager implements manager_interface
return $this->installer->check_requirements(); return $this->installer->check_requirements();
} }
/**
* Normalize a packages/version array. Every entry can have 3 different forms:
* - $package => $version
* - $indice => $package:$version
* - $indice => $package
* They are converted to he form:
* - $package => $version ($version is set to '*' for the third form)
*
* @param array $packages
*
* @return array
*/
protected function normalize_version(array $packages) protected function normalize_version(array $packages)
{ {
$normalized_packages = []; $normalized_packages = [];