aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #4459 from rxu/ticket/14794Marc Alexander2016-09-231-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14794] Adjust redirect() behavior for PHP 7.1+ compatibility
| * | | | [ticket/14794] Adjust redirect() behavior for PHP 7.1+ compatibilityrxu2016-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14794
* | | | | [ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+rxu2016-09-221-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-14793
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-09-188-16/+110
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14789] Add form tokens to tests and uncomment add_form_key [ticket/14789] Add link hashes and form tokens to all acp links/buttons
| * | | [ticket/14789] Add form tokens to tests and uncomment add_form_keyMarc Alexander2016-09-181-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14789
| * | | [ticket/14789] Add link hashes and form tokens to all acp links/buttonsMarc Alexander2016-09-188-17/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will further harden the ACP security by adding link hashes to links and form tokens to forms that did not have these yet and result in modified settings or write action on the filesystem or database. These few links and forms were still relying on the global ACP protection, mainly due to them not posing further risks of compromising data. After this change these will now also be properly protected against tampering. PHPBB3-14789
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-181-1/+23
|\ \ \ \ | |/ / /
| * | | Merge pull request #4442 from rxu/ticket/14781Marc Alexander2016-09-181-1/+23
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14781] Add core event to the function group_user_attributes()
| | * | | [ticket/14781] Add core event to the function group_user_attributes()rxu2016-09-121-1/+23
| | | | | | | | | | | | | | | | | | | | PHPBB3-14781
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-171-6/+123
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4398 from wesleyfok/ticket/14638-3.1.xMarc Alexander2016-09-171-6/+123
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Ticket/14638 3.1.x New UCP hooks for subscriptions
| | * | | | [ticket/14638] Rollback changes from 3.2.x versionWesley Fok2016-08-031-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mistakenly brought in the modified 3.2.x version verbatim instead of diffing against the 3.1.x version of ucp_main.php. Removed any changes I didn't explicitly make. PHPBB3-14638
| | * | | | Merge remote-tracking branch 'upstream/3.1.x' into ticket/14638-3.1.xWesley Fok2016-08-0311-25/+183
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | [ticket/14638] New UCP hooks for subscriptionsWesley Fok2016-08-031-15/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds various event hooks to the Manage subscriptions page of the User Control Panel. core.ucp_subscribed_post_data allows us to handle additional post data from the form that unwatches subscriptions. core.ucp_main_subscribed_forums_modify_query, core.ucp_main_topiclist_count_modify_query and core.ucp_main_topiclist_modify_query all modify the queries used to get the list of subscribed forums and subscribed/bookmarked topics. core.ucp_main_subscribed_forum_modify_template_vars and core.ucp_main_topiclist_topic_modify_template_vars modify the template variable array associated with each subscribed forum and topic row. This is a backport to 3.1.x of the code in PR #4318. PHPBB3-14638
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-173-11/+59
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4403 from rxu/ticket/14738Marc Alexander2016-09-173-11/+59
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | [ticket/14738] Add core events to improve modifying forum lists
| | * | | | [ticket/14738] Add core events to improve modifying forum listsrxu2016-08-073-11/+59
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-14738
* | | | | Merge pull request #4440 from danchr/ticket/14774Tristan Darricau2016-09-111-43/+55
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14774] Support partial downloads of attachments * danchr/ticket/14774: [ticket/14774] Support partial downloads of attachments
| * | | | | [ticket/14774] Support partial downloads of attachmentsDan Villiom Podlaski Christiansen2016-09-071-43/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phpBB already had limited support for partial downloads, but only for resuming downloads, disregarding any range ending before EOF. WebKit on iOS and OS X uses partial downloads when fetching media files. Previously, only MP3 attachments could play directly in the browser, reported as a live stream, but with this change, all supported media formats should render as expected. Tested using cURL by verifying that partial downloads give exactly the same results compared to Apache. PHPBB3-14774
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-091-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | [ticket/12133] fix download file names for WebKit-derived browsersDan Villiom Podlaski Christiansen2016-09-071-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All browser engines that descend from WebKit declare themselves as Safari in the user agent, including Chrome. Currently, the code assumes that any Safari-like browser cannot handle the RFC-compliant filename syntax. At least for recent versions of Safari, this is no longer the case, and the legacy syntax results in URI-quoted filenames. Using the standard syntax works as expected in both Safari 9 and Chrome 45. The ticket reporting this issue is from January 2014, so we can safely ignore compatibility: any browser still relying on the previous behaviour is unlikely to receive security updates. PHPBB3-12133
* | | | | Merge pull request #4435 from Crizz0/ticket/14764Marc Alexander2016-09-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14764] Wrong link to database update script has been fixed
| * | | | | [ticket/14764] Wrong link to database update script has been fixedCrizzo2016-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14764
* | | | | | [ticket/10961] Send HTTP 403 when applicableJakub Senko2016-09-0117-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10961
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-08-311-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * 3.1.x: [ticket/14673] Changes wrong language variable in mcp_forum
| * | | | [ticket/14673] Changes wrong language variable in mcp_forumCrizzo2016-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14673
* | | | | Merge pull request #4418 from Elsensee/ticket/14636Marc Alexander2016-08-211-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14636] Restore BC with compatibility functions
| * | | | | [ticket/14636] Inject into set_config methodsOliver Schramm2016-08-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13573 PHPBB3-14636
| * | | | | [ticket/14636] Restore BC with request_varOliver Schramm2016-08-201-0/+2
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-14636
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-211-8/+10
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | [ticket/12925] Pluralize permanent delete checkbox labelJakub Senko2016-08-151-8/+10
| |/ / | | | | | | | | | PHPBB3-12925
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-011-7/+17
|\ \ \ | |/ /
| * | [ticket/14721] Avoid renaming deleted usersOliver Schramm2016-08-011-7/+17
| | | | | | | | | | | | PHPBB3-14721
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-171-1/+11
|\ \ \ | |/ /
| * | [ticket/14713] Add core event to the admin function get_forum_list()rxu2016-07-171-1/+11
| | | | | | | | | | | | PHPBB3-14713
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-161-9/+22
|\ \ \ | |/ /
| * | Merge pull request #4374 from TheKigen/ticket/14616Marc Alexander2016-07-161-9/+22
| |\ \ | | | | | | | | | | | | [ticket/14616] Fixed auto-prune failing on large forums
| | * | [ticket/14616] Switch prune limit to sql_query_limit instead of sql_andMax Krivanek2016-07-061-7/+2
| | | | | | | | | | | | | | | | PHPBB3-14616
| | * | [ticket/14616] Added comma expected by test scripts.Max Krivanek2016-07-011-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14616
| | * | [ticket/14616] Added prune_limit to event core.prune_sqlMax Krivanek2016-06-281-1/+11
| | | | | | | | | | | | | | | | PHPBB3-14616
| | * | [ticket/14616] Removed misplaced tab.Max Krivanek2016-06-271-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14616
| | * | [ticket/14616] Fixed auto-prune failing on large forumsMax Krivanek2016-06-271-6/+14
| | | | | | | | | | | | | | | | PHPBB3-14616
* | | | [ticket/14709] add post_id to mod logWesley Fok2016-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the missing post_id value to the moderator log entry created upon deleting one or more posts in the MCP topic view. PHPBB3-14709
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-071-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: phpBB/install/install_install.php phpBB/language/en/install.php
| * | | Merge pull request #4342 from Senky/ticket/14654Marc Alexander2016-07-071-1/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14654] Change Imagemagick to ImageMagick
| | * | | [ticket/14654] Change Imagemagick to ImageMagickJakub Senko2016-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14654
* | | | | Merge pull request #4375 from bantu/ticket/14692Marc Alexander2016-07-061-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14692] Remove duplicate subexpression in questionnaire.php
| * | | | | [ticket/14692] Remove duplicate subexpression in questionnaire.phpkilida2016-07-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subexpression `($ip_address_ary[0] == '192' && $ip_address_ary[1] == '168')` was repeated. PHPBB3-14692
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-061-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge pull request #4354 from Stanzilla/smtp_explainMarc Alexander2016-07-061-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option