mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Addon validation check moved to separate method. Test added.

Browse Source
This commit is contained in:
Cameron
2020-04-24 11:58:51 -07:00
parent 6734f26978
commit 87a717dac3
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e107_handlers/plugin_class.php
View File

@@ -456,7 +456,7 @@ class e_plugin
} }
// Generic markup check // Generic markup check
if ($sc === false && (substr($content, 0, 5) != '<'.'?php') || ((substr($content, -2, 2) != '?'.'>') && (strrpos($content, '?'.'>') !== FALSE))) if ($sc === false && !$this->isValidAddonMarkup($content))
{ {
return 1; return 1;
} }
@@ -482,11 +482,19 @@ class e_plugin
return 0; return 0;
} }
public function isValidAddonMarkup($content='')
{
if ((substr($content, 0, 5) != '<'.'?php') || ((substr($content, -2, 2) != '?'.'>') && (strrpos($content, '?'.'>') !== FALSE)))
{
return false;
}
return true;
}
public function getUpgradableList() public function getUpgradableList()
{ {

18
e107_tests/tests/unit/e_pluginTest.php
View File

@@ -295,6 +295,24 @@
$this->assertEquals('news', $result['folder']); $this->assertEquals('news', $result['folder']);
$this->assertEquals('menu', $result['category']); $this->assertEquals('menu', $result['category']);
} }
public function testIsValidAddonMarkup()
{
$content = ' <?php ';
$result = $this->ep->isValidAddonMarkup($content);
$this->assertFalse($result);
$content = ' ?>
';
$result = $this->ep->isValidAddonMarkup($content);
$this->assertFalse($result);
$content = '<?php
?>';
$result = $this->ep->isValidAddonMarkup($content);
$this->assertTrue($result);
}
/* /*
public function testLoad() public function testLoad()
{ {