diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-05 12:59:55 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-05 12:59:55 +0200 |
| commit | cbe74844b01f72d2007376ceafdf979a6cc94d47 (patch) | |
| tree | 558cc4463fdd8cf4b67f6a42197e2349560e690e /phpBB/phpbb/textformatter/s9e | |
| parent | e70373a8202e0431a99f80b941e46ae0282a94d4 (diff) | |
| parent | 88348e1ccc32e8ba731ee079383061792ab01a16 (diff) | |
| download | forums-cbe74844b01f72d2007376ceafdf979a6cc94d47.tar forums-cbe74844b01f72d2007376ceafdf979a6cc94d47.tar.gz forums-cbe74844b01f72d2007376ceafdf979a6cc94d47.tar.bz2 forums-cbe74844b01f72d2007376ceafdf979a6cc94d47.tar.xz forums-cbe74844b01f72d2007376ceafdf979a6cc94d47.zip | |
Merge pull request #3698 from s9e/ticket/13935
[ticket/13935] Allow more admin-configurable schemes in post links
* s9e/ticket/13935:
[ticket/13935] Removed cache invalidation from acp_board
[ticket/13935] Removed UI
[ticket/13935] Allow more admin-configurable schemes in post links
Diffstat (limited to 'phpBB/phpbb/textformatter/s9e')
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/factory.php | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php index 2aab97b667..4a04b34cd8 100644 --- a/phpBB/phpbb/textformatter/s9e/factory.php +++ b/phpBB/phpbb/textformatter/s9e/factory.php @@ -43,6 +43,11 @@ class factory implements \phpbb\textformatter\cache_interface protected $cache_key_renderer; /** + * @var \phpbb\config\config + */ + protected $config; + + /** * @var array Custom tokens used in bbcode.html and their corresponding token from the definition */ protected $custom_tokens = array( @@ -127,16 +132,18 @@ class factory implements \phpbb\textformatter\cache_interface * @param \phpbb\textformatter\data_access $data_access * @param \phpbb\cache\driver\driver_interface $cache * @param \phpbb\event\dispatcher_interface $dispatcher + * @param \phpbb\config\config $config * @param string $cache_dir Path to the cache dir * @param string $cache_key_parser Cache key used for the parser * @param string $cache_key_renderer Cache key used for the renderer */ - public function __construct(\phpbb\textformatter\data_access $data_access, \phpbb\cache\driver\driver_interface $cache, \phpbb\event\dispatcher_interface $dispatcher, $cache_dir, $cache_key_parser, $cache_key_renderer) + public function __construct(\phpbb\textformatter\data_access $data_access, \phpbb\cache\driver\driver_interface $cache, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\config\config $config, $cache_dir, $cache_key_parser, $cache_key_renderer) { $this->cache = $cache; $this->cache_dir = $cache_dir; $this->cache_key_parser = $cache_key_parser; $this->cache_key_renderer = $cache_key_renderer; + $this->config = $config; $this->data_access = $data_access; $this->dispatcher = $dispatcher; } @@ -190,6 +197,16 @@ class factory implements \phpbb\textformatter\cache_interface $vars = array('configurator'); extract($this->dispatcher->trigger_event('core.text_formatter_s9e_configure_before', compact($vars))); + // Reset the list of allowed schemes + foreach ($configurator->urlConfig->getAllowedSchemes() as $scheme) + { + $configurator->urlConfig->disallowScheme($scheme); + } + foreach (explode(',', $this->config['allowed_schemes_links']) as $scheme) + { + $configurator->urlConfig->allowScheme(trim($scheme)); + } + // Convert newlines to br elements by default $configurator->rootRules->enableAutoLineBreaks(); |