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

[ticket/14938] Inconsistency in ext_mgr all_available vs is_available

Browse source 
Made is_available much more strict, in line with the checks in all_available

PHPBB3-14938
This commit is contained in:
javiexin 2016-12-26 21:07:31 +01:00
parent 3322117c38
commit efc2b46303
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
phpBB/phpbb/extension/manager.php
View file

@ -524,7 +524,29 @@ class manager
*/ */
public function is_available($name) public function is_available($name)
{ {
return file_exists($this->get_extension_path($name, true)); // Not available if the folder does not exist
if (!file_exists($this->get_extension_path($name, true)))
{
return false;
}
$composer_file = $this->get_extension_path($name, true) . '/composer.json';
// Not available if there is no composer.json.
if (!is_readable($composer_file) || !($ext_info = file_get_contents($composer_file)))
{
return false;
}
$ext_info = json_decode($ext_info, true);
// Not available if malformed name or if the directory structure
// does not match the name value specified in composer.json.
if (substr_count($name, '/') !== 1 || !isset($ext_info['name']) || $name != $ext_info['name'])
{
return false;
}
return true;
} }
/** /**