mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 19:54:12 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3698 from s9e/ticket/13935

Browse Source 
[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
This commit is contained in:
Tristan Darricau
2015-08-05 12:59:55 +02:00
parent e70373a820 88348e1ccc
commit cbe74844b0
6 changed files with 69 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/config/default/container/services_text_formatter.yml
View File

@@ -32,6 +32,7 @@ services:
- @text_formatter.data_access
- @cache.driver
- @dispatcher
- @config
- %text_formatter.cache.dir%
- %text_formatter.cache.parser.key%
- %text_formatter.cache.renderer.key%

1
phpBB/install/schemas/schema_data.sql
View File

@@ -41,6 +41,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_pm', '1'
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_smilies', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_smilies', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_topic_notify', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allowed_schemes_links', 'http,https,ftp');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('assets_version', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('attachment_quota', '52428800');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_bbcode_pm', '1');

24
phpBB/phpbb/db/migration/data/v320/allowed_schemes_links.php Normal file
View File

@@ -0,0 +1,24 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb\db\migration\data\v320;
class allowed_schemes_links extends \phpbb\db\migration\migration
{
public function update_data()
{
return array(
array('config.add', array('allowed_schemes_links', 'http,https,ftp')),
);
}
}

19
phpBB/phpbb/textformatter/s9e/factory.php
View File

@@ -42,6 +42,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
*/
@@ -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();