diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-11 22:16:10 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-11 22:16:10 +0100 |
| commit | c9e5d308f2ebaae5ddaa70faf25af93fe2eb368b (patch) | |
| tree | d1a901b18261466f47a5db5cc1cf9362a9974a1f /phpBB/includes | |
| parent | aa6dd6d4ff28f38f9596b7bb3adf19a8a7988b67 (diff) | |
| parent | 8cf086ef9b200f0b59348c0f0d4946f9ebc4adae (diff) | |
| download | forums-c9e5d308f2ebaae5ddaa70faf25af93fe2eb368b.tar forums-c9e5d308f2ebaae5ddaa70faf25af93fe2eb368b.tar.gz forums-c9e5d308f2ebaae5ddaa70faf25af93fe2eb368b.tar.bz2 forums-c9e5d308f2ebaae5ddaa70faf25af93fe2eb368b.tar.xz forums-c9e5d308f2ebaae5ddaa70faf25af93fe2eb368b.zip | |
Merge pull request #4159 from marc1706/ticket/14448
[ticket/14448] Use guzzle for remote files uploading
* marc1706/ticket/14448:
[ticket/14448] Correctly pass verify setting if available
[ticket/14448] Let user decide if remote upload certs should be checked
[ticket/14448] Add new vendor files and dirs to clean task
[ticket/14448] Do not try to test remote upload timeout
[ticket/14448] Remove no longer needed guzzle 3.9.3
[ticket/14448] Use GuzzleHttp and try to verify certs
[ticket/14448] Update composer.json and lock file for guzzlehttp
[ticket/14431] Remote avatar uploading
[ticket/14431] Remote avatar uploading
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 26663d2a62..9d65c48bed 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -415,6 +415,7 @@ class acp_board 'browser_check' => array('lang' => 'BROWSER_VALID', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'forwarded_for_check' => array('lang' => 'FORWARDED_FOR_VALID', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'referer_validation' => array('lang' => 'REFERRER_VALID', 'validate' => 'int:0:3','type' => 'custom', 'method' => 'select_ref_check', 'explain' => true), + 'remote_upload_verify' => array('lang' => 'UPLOAD_CERT_VALID', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'check_dnsbl' => array('lang' => 'CHECK_DNSBL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'email_check_mx' => array('lang' => 'EMAIL_CHECK_MX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'max_pass_chars' => array('lang' => 'PASSWORD_LENGTH', 'validate' => 'int:8:255', 'type' => false, 'method' => false, 'explain' => false,), |