Commit graph

25179 commits

Author SHA1 Message Date
Andreas Fischer
7c2115d95a Merge branch '3.1.x'
* 3.1.x:
  [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
2015-04-27 22:15:57 +02:00
javiexin
f80dc9dc16 [ticket/13786] Add events to add MCP post options
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html
Fix another typo.

PHPBB3-13786
2015-04-27 17:36:43 +02:00
Tristan Darricau
734b89e75c Merge pull request #3524 from marc1706/ticket/8672
[ticket/8672] Add class for retrieving imagesize without download
2015-04-27 16:26:40 +02:00
javiexin
18e8f281be [ticket/13786] Add events to add MCP post options
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html
Fix typo.

PHPBB3-13786
2015-04-27 15:35:09 +02:00
javiexin
e98a5afd07 [ticket/13786] Add events to add MCP post options
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html

PHPBB3-13786
2015-04-27 13:21:23 +02:00
Matt Friedman
281661c23e [ticket/13778] Update wording of the reCaptcha instructions
PHPBB3-13778
2015-04-26 20:57:56 -07:00
Wolfsblvt
55a3d88793 [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
When options are shown and poll delete is allowed, the option to
delete
polls is shown twice. This is fixed here by moving the if poll
delete
check out of the outer if, wich makes it also more consistent
with the
new event.

PHPBB3-13787
2015-04-27 02:27:29 +02:00
Alexander Köplinger
e25e411e2b [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
The code was added as a workaround for bugs in very old versions of IIS,
dating back to 2002: see commit 849d766974.

Newer IIS versions handle the 'Location' header just fine, so we can avoid
the unnecessary HTML page for redirects. Given that it seems to work fine
since IIS 6.0 (on WinServer 2003), I don't think it's worth adding a special
check for earlier versions as they are no longer supported by MS as well.

PHPBB3-12101
2015-04-26 22:10:06 +02:00
Andreas Fischer
e7d2977401 Merge pull request #3548 from s9e/ticket/12745
[ticket/12745] Allow Unicode characters from the SMP to be used in text

* s9e/ticket/12745:
  [ticket/12745] Added HTML entity test
  [ticket/12745] Added support for Unicode characters outside BMP
  [ticket/12745] Updated s9e\TextFormatter
2015-04-26 20:25:14 +02:00
Marc Alexander
03eae6fddd Merge branch '3.1.x' 2015-04-26 09:24:09 +02:00
Marc Alexander
59a178f3cb Merge pull request #3532 from prototech/ticket/13755
[ticket/13755] Ignore dots in path when determining file extension.
2015-04-26 09:24:03 +02:00
rxu
2308472eb0 [ticket/13779] Set new auth options to the role only if matching the role type
Migrations' permission tool allows setting permissions to the role which
doesn't match the role type, e.g. m_ permissions for u_ role types and so on.
As one of side effects, this may lead to granting users moderative/admin
permissions silently.
With this patch the only new permissions matching the role type will be set.

PHPBB3-13779
2015-04-26 11:57:02 +07:00
JoshyPHP
25acba2259 [ticket/12745] Added support for Unicode characters outside BMP
PHPBB3-12745
2015-04-25 23:43:32 +02:00
JoshyPHP
572a905c02 [ticket/12745] Updated s9e\TextFormatter
PHPBB3-12745
2015-04-25 23:42:54 +02:00
Andreas Fischer
80d4fb1847 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
2015-04-25 18:11:19 +02:00
Andreas Fischer
0fc70d4b15 Merge pull request #3550 from bantu/ticket/13765-3.1.4
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

* bantu/ticket/13765-3.1.4:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
2015-04-25 18:11:07 +02:00
Andreas Fischer
901875a1fb Merge branch 'ticket/13765' into ticket/13765-3.1.4
* ticket/13765:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

Conflicts:
	phpBB/includes/functions.php
	phpBB/includes/startup.php
2015-04-25 17:41:17 +02:00
Joas Schilling
463c62df18 [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
PHPBB3-13765
2015-04-25 17:22:10 +02:00
Marc Alexander
9088f44863 [ticket/8672] Update hash of lock file
PHPBB3-8672
2015-04-24 13:39:15 +02:00
Marc Alexander
55c5bc126d [ticket/8672] User $user->lang() instead of sprintf
PHPBB3-8672
2015-04-24 13:34:18 +02:00
Marc Alexander
2665e68592 [ticket/8672] Update fastImageSize to 1.0.2
PHPBB3-8672
2015-04-24 13:33:16 +02:00
Marc Alexander
0a6ac0226d [ticket/8672] Update fastImageSize to 1.0.1
PHPBB3-8672
2015-04-24 13:33:15 +02:00
Marc Alexander
f92d894470 [ticket/8672] Remove outdated imagesize class
PHPBB3-8672
2015-04-24 13:33:14 +02:00
Marc Alexander
39d6180c68 [ticket/8672] Use fastImageSize in classes
PHPBB3-8672
2015-04-24 13:33:14 +02:00
Marc Alexander
3fc7a352ff [ticket/8672] Add fast-image-size library to composer.json
PHPBB3-8672
2015-04-24 13:33:13 +02:00
JoshyPHP
245d042e43 [ticket/8672] Updated the text_formatter.s9e service
PHPBB3-8672
2015-04-24 13:31:37 +02:00
Marc Alexander
2fa99602c6 [ticket/8672] Add class for retrieving imagesize without download
getimagesize() always downloads the complete file before checking
the actual image dimensions. This class will be able to do the same
without having to download possibly large files.

PHPBB3-8672
2015-04-24 13:31:36 +02:00
JoshyPHP
72596429bd [ticket/13774] Updated s9e\TextFormatter
PHPBB3-13774
2015-04-22 22:35:47 +02:00
Andreas Fischer
eba5b59533 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
2015-04-22 15:15:09 +02:00
RMcGirr83
a53b57c8a2 [ticket/13759] Take post_time into account
PHPBB3-13759
2015-04-21 06:11:13 -04:00
brunoais
8769f185f5 [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
PHPBB3-13772
2015-04-21 10:00:30 +01:00
Matt Friedman
4a7f905c6a [ticket/13771] Allow AJAX errors to support exceptions messages
PHPBB3-13771
2015-04-21 00:19:41 -07:00
Tristan Darricau
de5a5c41f8 [ticket/13768] Fix deprecations
PHPBB3-13768
2015-04-19 17:41:29 +02:00
Tristan Darricau
9939ced81f [ticket/13768] Update to symfony 2.8.*@dev
PHPBB3-13768
2015-04-19 17:33:06 +02:00
Tristan Darricau
ecc65f564d Merge pull request #3539 from MateBartus/ticket/13766
[ticket/13766] Add style_parent_id in textformater's data_access::get_st...
2015-04-17 00:07:04 +02:00
MateBartus
f23fe9e69d [ticket/13766] Add style_parent_id in textformater's data_access::get_styles()
PHPBB3-13766
2015-04-16 23:28:52 +02:00
Tristan Darricau
c89384eb86 Merge pull request #3446 from MateBartus/ticket/13654
[ticket/13654] Moving reporting into controller
2015-04-16 21:30:52 +02:00
Tristan Darricau
f077b72d0d Merge pull request #3487 from MateBartus/ticket/13697
[ticket/13697] Moving filesystem related functions to filesystem service
2015-04-16 20:44:02 +02:00
Andreas Fischer
db9ef52fdd Merge branch '3.1.x'
* 3.1.x:
  [ticket/13763] Fix typo in extension lang file
2015-04-16 13:38:48 +02:00
MateBartus
4bdef6fd21 [ticket/13697] Moving filesystem related functions to filesystem service
* Moving filesystem service to \phpbb\filesystem namespace
 * Wraping Symfony's Filesystem component
 * Moving filesystem related functions from includes/functions.php
   into \phpbb\filesystem\filesystem
   Functions moved (and deprecated):
     - phpbb_chmod
     - phpbb_is_writable
     - phpbb_is_absolute
     - phpbb_own_realpath
     - phpbb_realpath
 * Adding interface for filesystem service

PHPBB3-13697
2015-04-16 13:24:10 +02:00
MateBartus
a089ff5eb0 [ticket/13654] Moving reporting into controller
Moving report.php's content into different services and controllers to
better comply with the MVC model.

Also implementing:
 * Replacement for reasons_display()
 * Adding assign_meta_refresh_var() to \controller\helper
 * Adding separate routes for easy configuration
 * Updating unit tests to expect to correct results
 * Add BC tests

PHPBB3-13654
2015-04-16 11:29:11 +02:00
Richard McGirr
60f31d48e2 [ticket/13763] Fix typo in extension lang file
PHPBB3-13763
2015-04-15 07:35:42 -04:00
rxu
615e5c1076 [ticket/13745] Add viewtopic.php core events to allow manipulating poll data
PHPBB3-13745
2015-04-15 14:12:49 +07:00
Dhruv
2c0b1252c8 Merge branch '3.1.x' 2015-04-14 09:10:47 +05:30
Oliver Schramm
70c74df009 [ticket/13756] Fix resize after upload with plupload
PHPBB3-13756
2015-04-11 23:08:45 +02:00
Joas Schilling
ee658bfe7b [ticket/security-180] Always fail when redirecting to an insecure URL
SECURITY-180
2015-04-11 17:08:28 +02:00
Marc Alexander
bca1b96b2e [ticket/security-180] Make sure that redirect goes to full URL plus slash
SECURITY-180
2015-04-11 16:41:20 +02:00
Cesar G
47514ca2df [ticket/13755] Ignore dots in path when determining file extension.
PHPBB3-13755
2015-04-10 16:23:51 -07:00
Marc Alexander
eed355b798 [ticket/security-180] Check if redirect URL contains board URL
SECURITY-180
2015-04-10 18:10:32 +02:00
Joas Schilling
bf107ba1af Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2015-04-10 10:06:07 +02:00