mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:11:47 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1742 from EXreaction/ticket/11840

Browse Source 
Ticket/11840 Refactor the extension metadata class
This commit is contained in:
David King
2013-10-04 15:40:20 -07:00
parent e8c7f8134d b931b0b35b
commit 82b9df543b
6 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/phpbb/extension/metadata_manager.php
View File

@@ -203,7 +203,7 @@ class metadata_manager
// Basic fields
$fields = array(
'name' => '#^[a-zA-Z0-9_\x7f-\xff]{2,}/[a-zA-Z0-9_\x7f-\xff]{2,}$#',
'type' => '#^phpbb3-extension$#',
'type' => '#^phpbb-extension$#',
'licence' => '#.+#',
'version' => '#.+#',
);
@@ -291,12 +291,12 @@ class metadata_manager
*/
public function validate_require_phpbb()
{
if (!isset($this->metadata['require']['phpbb']))
if (!isset($this->metadata['require']['phpbb/phpbb']))
{
return true;
return false;
}
return $this->_validate_version($this->metadata['require']['phpbb'], $this->config['version']);
return true;
}
/**
@@ -308,10 +308,10 @@ class metadata_manager
{
if (!isset($this->metadata['require']['php']))
{
return true;
return false;
}
return $this->_validate_version($this->metadata['require']['php'], phpversion());
return true;
}
/**
@@ -354,7 +354,7 @@ class metadata_manager
'META_REQUIRE_PHP' => (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '',
'META_REQUIRE_PHP_FAIL' => !$this->validate_require_php(),
'META_REQUIRE_PHPBB' => (isset($this->metadata['require']['phpbb'])) ? htmlspecialchars($this->metadata['require']['phpbb']) : '',
'META_REQUIRE_PHPBB' => (isset($this->metadata['require']['phpbb/phpbb'])) ? htmlspecialchars($this->metadata['require']['phpbb/phpbb']) : '',
'META_REQUIRE_PHPBB_FAIL' => !$this->validate_require_phpbb(),
'META_DISPLAY_NAME' => (isset($this->metadata['extra']['display-name'])) ? htmlspecialchars($this->metadata['extra']['display-name']) : '',