mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Performance: Reduced e107::getFolder() usage from 2500+ to less than 30.

Browse Source
This commit is contained in:
Cameron
2020-12-21 06:41:45 -08:00
parent 539c3f1a67
commit 78665cd56d
2 changed files with 62 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
e107_handlers/e_parse_class.php
View File

@@ -66,6 +66,9 @@ class e_parse extends e_parser
protected $staticUrl = null; protected $staticUrl = null;
/** @var array Stored relative paths - used by replaceConstants() */
private $relativePaths = array();
// BBcode that contain preformatted code. // BBcode that contain preformatted code.
private $preformatted = array('html', 'markdown'); private $preformatted = array('html', 'markdown');
@@ -3296,37 +3299,44 @@ class e_parse extends e_parser
return $new; return $new;
} }
if($mode != '')
if(!empty($mode))
{ {
$e107 = e107::getInstance(); $e107 = e107::getInstance();
$replace_relative = array( if(empty($this->relativePaths)) // prevent multiple lookups.
$e107::getFolder('media_files'), {
$e107::getFolder('media_video'),
$e107::getFolder('media_image'), $this->relativePaths = array(
$e107::getFolder('media_icon'), $e107::getFolder('media_files'),
$e107::getFolder('avatars'), $e107::getFolder('media_video'),
$e107::getFolder('web_js'), $e107::getFolder('media_image'),
$e107::getFolder('web_css'), $e107::getFolder('media_icon'),
$e107::getFolder('web_image'), $e107::getFolder('avatars'),
//$e107->getFolder('web_pack'), $e107::getFolder('web_js'),
e_IMAGE_ABS, $e107::getFolder('web_css'),
e_THEME_ABS, $e107::getFolder('web_image'),
$e107::getFolder('images'), //$e107->getFolder('web_pack'),
$e107::getFolder('plugins'), e_IMAGE_ABS,
$e107::getFolder('files'), e_THEME_ABS,
$e107::getFolder('themes'), $e107::getFolder('images'),
// $e107->getFolder('downloads'), $e107::getFolder('plugins'),
$e107::getFolder('handlers'), $e107::getFolder('files'),
$e107::getFolder('media'), $e107::getFolder('themes'),
$e107::getFolder('web'), // $e107->getFolder('downloads'),
$e107->site_theme ? $e107::getFolder('themes').$e107->site_theme.'/' : '', $e107::getFolder('handlers'),
defset('THEME_ABS'), $e107::getFolder('media'),
(ADMIN ? $e107::getFolder('admin') : ''), $e107::getFolder('web'),
'', $e107->site_theme ? $e107::getFolder('themes').$e107->site_theme.'/' : '',
$e107::getFolder('core'), defset('THEME_ABS'),
$e107::getFolder('system'), (ADMIN ? $e107::getFolder('admin') : ''),
); '',
$e107::getFolder('core'),
$e107::getFolder('system'),
);
}
$replace_relative = $this->relativePaths;
switch ($mode) switch ($mode)
{ {
@@ -3815,8 +3825,8 @@ class e_parse extends e_parser
* Cameron's DOM-based parser. * Cameron's DOM-based parser.
* *
* @method replaceConstants($text, $mode = '', $all = false) * @method replaceConstants($text, $mode = '', $all = false)
* @method toAttribute($title) * @method toAttribute($text)
* @method thumbUrl($icon) * @method thumbUrl($url)
* @method thumbDimensions() * @method thumbDimensions()
*/ */
class e_parser class e_parser

24
e107_tests/tests/unit/e_parseTest.php
View File

@@ -505,10 +505,30 @@ while($row = $sql->fetch())
*/ */
public function testReplaceConstants() public function testReplaceConstants()
{ {
$actual = $this->tp->replaceConstants('{e_BASE}news','abs'); $tests = array(
0 => array(
'path' => '{e_BASE}news',
'type' => 'abs',
'match' => e_HTTP,
),
1 => array(
'path' => '{e_BASE}news.php',
'type' => 'full',
'match' => 'https://localhost/e107/news.php',
),
2 => array(
'path' => '{e_PLUGIN}news/index.php',
'type' => null,
'match' => 'e107_plugins/news/index.php',
),
);
$this->assertStringContainsString(e_HTTP,$actual);
foreach($tests as $var)
{
$actual = $this->tp->replaceConstants($var['path'],$var['type']);
$this->assertStringContainsString($var['match'], $actual);
}
} }
/* /*