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

[ticket/10631] Additional validation

Browse source 
PHPBB3-10631
This commit is contained in:
Nathan Guse 2012-07-23 15:39:13 -05:00 • committed by Unknown Bliss
parent 4314284de1
commit 8df9963fcc
1 changed files with 25 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
phpBB/includes/extension/metadata_manager.php
View file

@ -42,6 +42,7 @@ class phpbb_extension_metadata_manager
'description' => '#.*#', 'description' => '#.*#',
'version' => '#.+#', 'version' => '#.+#',
'licence' => '#.+#', 'licence' => '#.+#',
//'homepage' => '#([\d\w-.]+?\.(a[cdefgilmnoqrstuwz]|b[abdefghijmnorstvwyz]|c[acdfghiklmnoruvxyz]|d[ejkmnoz]|e[ceghrst]|f[ijkmnor]|g[abdefghilmnpqrstuwy]|h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|m[acdghklmnopqrstuvwxyz]|n[acefgilopruz]|om|p[aefghklmnrstwy]|qa|r[eouw]|s[abcdeghijklmnortuvyz]|t[cdfghjkmnoprtvwz]|u[augkmsyz]|v[aceginu]|w[fs]|y[etu]|z[amw]|aero|arpa|biz|com|coop|edu|info|int|gov|mil|museum|name|net|org|pro)(\b|\W(?<!&|=)(?!\.\s|\.{3}).*?))(\s|$)#',
'extra' => array( 'extra' => array(
'display-name' => '#.*#', 'display-name' => '#.*#',
), ),
@ -76,7 +77,7 @@ class phpbb_extension_metadata_manager
return (isset($this->metadata['extra'][$name])) ? preg_match($this->validation['extra'][$name], $this->metadata['extra'][$name]) : true; return (isset($this->metadata['extra'][$name])) ? preg_match($this->validation['extra'][$name], $this->metadata['extra'][$name]) : true;
} }
} }
else if (isset($this->validation[$name])) else if (isset($this->validation[$name]) && isset($this->metadata[$name]))
{ {
return preg_match($this->validation[$name], $this->metadata[$name]); return preg_match($this->validation[$name], $this->metadata[$name]);
} }
@ -258,6 +259,29 @@ class phpbb_extension_metadata_manager
} }
} }
return $this->validate_authors();
}
/**
* Validates the contents of the authors field
*
* @return boolean True when passes validation
*/
private function validate_authors()
{
if (empty($this->metadata['authors']))
{
return false;
}
foreach ($this->metadata['authors'] as $author)
{
if (!isset($author['name']))
{
return false;
}
}
return true; return true;
} }
@ -338,55 +362,6 @@ class phpbb_extension_metadata_manager
return version_compare($current_version, $string, '>='); return version_compare($current_version, $string, '>=');
} }
/**
* Validates the contents of the time field
*
* @return boolean True when passes validation
*/
private function validate_time()
{
// Need to validate
return true;
}
/**
* Validates the contents of the homepage field
*
* @return boolean True when passes validation
*/
private function validate_homepage()
{
return preg_match('#([\d\w-.]+?\.(a[cdefgilmnoqrstuwz]|b[abdefghijmnorstvwyz]|c[acdfghiklmnoruvxyz]|d[ejkmnoz]|e[ceghrst]|f[ijkmnor]|g[abdefghilmnpqrstuwy]|h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|m[acdghklmnopqrstuvwxyz]|n[acefgilopruz]|om|p[aefghklmnrstwy]|qa|r[eouw]|s[abcdeghijklmnortuvyz]|t[cdfghjkmnoprtvwz]|u[augkmsyz]|v[aceginu]|w[fs]|y[etu]|z[amw]|aero|arpa|biz|com|coop|edu|info|int|gov|mil|museum|name|net|org|pro)(\b|\W(?<!&|=)(?!\.\s|\.{3}).*?))(\s|$)#', $this->metadata['homepage']);
}
/**
* Validates the contents of the authors field
*
* @return boolean True when passes validation
*/
private function validate_authors()
{
// Need to validate
$number_authors = sizeof($this->metadata['authors']); // Might be helpful later on
if (!isset($this->metadata['authors']['1']))
{
return false;
}
else
{
foreach ($this->metadata['authors'] as $author)
{
if (!isset($author['name']))
{
return false;
}
}
}
return true;
}
/** /**
* Outputs the metadata into the template * Outputs the metadata into the template
* *
@ -394,7 +369,6 @@ class phpbb_extension_metadata_manager
*/ */
public function output_template_data() public function output_template_data()
{ {
$this->template->assign_vars(array( $this->template->assign_vars(array(
'MD_NAME' => htmlspecialchars($this->metadata['name']), 'MD_NAME' => htmlspecialchars($this->metadata['name']),
'MD_TYPE' => htmlspecialchars($this->metadata['type']), 'MD_TYPE' => htmlspecialchars($this->metadata['type']),