1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 15:16:16 +02:00

1466 Commits

Author SHA1 Message Date
Andreas Fischer
89f7fc63e8 Merge pull request #3703 from javiexin/ticket/10711
[ticket/10711] Duplicate key error on forum_tracks_table

* javiexin/ticket/10711:
  [ticket/10711] Duplicate key error on forum_tracks_table
2015-06-13 16:27:44 +02:00
javiexin
7b026eff79 [ticket/10711] Duplicate key error on forum_tracks_table
In certain situations, an SQL error DUPLICATE ERROR for KEY 'PRIMARY'
in the forums_track table is produced when marking forums read
(viewforum.php?f=xx&mark=forums).

The problem happens when there are duplicates in the forum_id array.
The solution is to remove those duplicates.

PHPBB3-10711
2015-06-13 01:08:18 +02:00
Nils Adermann
01073ffcbf Merge pull request #3560 from Nicofuma/ticket/13790
[ticket/13790] Update phpcs
2015-05-30 10:53:47 +02:00
Tristan Darricau
a462f14aa3 [ticket/13790] Update phpcs
PHPBB3-13790
2015-05-19 22:19:18 +02:00
Andreas Fischer
aa0c55ed8f Merge branch 'prep-release-3.1.4' into 3.1.x
* prep-release-3.1.4:
  [ticket/security-180] Use language variable for redirect error in 3.1+
  [ticket/security-180] Merge if statement with previous one in 3.1.x
  [ticket/security-180] Add tests for redirecting to main URL
  [ticket/security-180] Always fail when redirecting to an insecure URL
  [ticket/security-180] Make sure that redirect goes to full URL plus slash
  [ticket/security-180] Check if redirect URL contains board URL
2015-04-28 22:17:37 +02:00
Marc Alexander
d7c96cc60c [ticket/security-180] Use language variable for redirect error in 3.1+
SECURITY-180
2015-04-28 22:12:04 +02:00
Marc Alexander
416728fc17 Merge branch 'ticket/security-180' into ticket/security-180-asc
Conflicts:
	tests/security/redirect_test.php
2015-04-28 22:12:03 +02:00
Marc Alexander
ec207d0a71 [ticket/security-180] Merge if statement with previous one in 3.1.x
SECURITY-180
2015-04-28 22:08:19 +02:00
Marc Alexander
89723b17d9 Merge branch 'ticket/security-180' into ticket/security-180-asc
Conflicts:
	tests/security/redirect_test.php
2015-04-28 22:08:15 +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 849d76697444f4e3523845f8c96569ccde57d868.

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
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
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
Marc Alexander
eed355b798 [ticket/security-180] Check if redirect URL contains board URL
SECURITY-180
2015-04-10 18:10:32 +02:00
Cesar G
0bc2f9f242 [ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.
LOGIN_ERROR_PASSWORD may be returned as the message if the password is invalid
while hitting the LOGIN_ERROR_ATTEMPTS error.

PHPBB3-13698
2015-03-23 17:52:17 -07:00
Joas Schilling
3ac583271f Merge pull request #3381 from rxu/ticket/13591
[ticket/13591] Add core events to the function obtain_users_online_string()
2015-02-24 21:56:34 +01:00
rxu
fa1c61f608 [ticket/13433] Fix parsing of email addresses
Currently email addresses are parsed incorrectly due to the regex structure.
Namely, if localpart consists of several dot separated parts, only the last
part with the trailing dot will be captured.
The patch change this behavior to capture the whole localpart.

PHPBB3-13433
2015-02-17 17:24:30 +07:00
rxu
072df2217c [ticket/13591] Add core events to the function obtain_users_online_string()
Add functions.php core events to the function obtain_users_online_string()
to allow extensions adding/modifying online users data.

PHPBB3-13591
2015-02-08 12:28:28 +07:00
Joas Schilling
0e6cd94fb4 Merge pull request #3317 from Wolfsblvt/ticket/13532
Add core event to get_unread_topics() in functions.php
2015-02-02 23:12:42 +01:00
Joas Schilling
0aea283ab0 Merge pull request #3305 from Wolfsblvt/ticket/13518
Add core event to markread() in functions.php
2015-02-02 23:09:34 +01:00
Wolfsblvt
b88b8305fd [ticket/13518] Add core event to markread() in functions.php
Adding core event core.markread_before to to funtion markread()
in functions.php, so that you now are able to add additional
stuff inside the markread process, for example notifications designed
in extensions.

PHPBB3-13518
2015-01-23 12:53:46 +01:00
Wolfsblvt
1dce9576e9 [ticket/13532] Add core event to get_unread_topics() in functions.php
Adding core event core.get_unread_topics_modify_sql to to funtion
get_unread_topics() in functions.php, so that you now are able to modify
the sql query that retrieves the unread topics.

PHPBB3-13532
2015-01-23 12:48:57 +01:00
Tristan Darricau
add3d3e760 Merge pull request #3055 from marc1706/ticket/13192
[ticket/13192] Add method for generating valid user page links based on mod_rewrite

* marc1706/ticket/13192:
  [ticket/13192] Add test for app.php in external subfolder
  [ticket/13192] Use ltrim() instead of preg_replace()
  [ticket/13192] Order test cases consistently
  [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root
  [ticket/13192] Pass correct parameters and rename method to get_valid_page
  [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals
  [ticket/13192] Use get_valid_user_page method in build_url function
  [ticket/13192] Add method for generating valid user page links
2015-01-19 16:45:43 +01:00
Joas Schilling
8ae1b0c52e Merge pull request #3189 from rxu/ticket/12926
[ticket/12926] Support for IDN (IRI)
2015-01-10 00:09:57 +01:00
rxu
d86bdcb2a7 [ticket/12926] Get rid of the $scheme and $inline vars, fix regex_idn.php
Get rid of the $scheme and $inline vars, fix regex_idn.php to generate
both common and inline mode regexes all at once.

PHPBB3-12926
2015-01-10 03:21:36 +07:00
Matt Friedman
88034ea2f0 [ticket/13440] Update event version to 3.1.3-RC1
PHPBB3-13440
2015-01-04 01:40:18 -08:00
Matt Friedman
9d9b8139d0 [ticket/13440] Add event core.login_box_failed
PHPBB3-13440
2015-01-03 15:23:50 -08:00
rxu
a8c62e707a [ticket/12926] Support for IDN (IRI)
Add international domain name support for URLs.

PHPBB3-12926
2014-11-27 01:18:49 +07:00
Nils Adermann
df5366a5ca [ticket/13232] Use a cache var with _ to force TTL and shuffle cron tasks
PHPBB3-13232
2014-10-27 15:42:26 -07:00
Marc Alexander
a623868f20 [ticket/13192] Pass correct parameters and rename method to get_valid_page
PHPBB3-13192
2014-10-21 22:38:03 -05:00
Marc Alexander
ce8c09f51f [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals
The $request global existed twice and the $phpEx global is not being used
in confirm_box().

PHPBB3-13192
2014-10-21 22:17:48 -05:00
Marc Alexander
c381ad2002 [ticket/13192] Use get_valid_user_page method in build_url function
PHPBB3-13192
2014-10-21 22:17:24 -05:00
Joas Schilling
240ff27707 Merge pull request #3000 from rxu/ticket/13110
[ticket/13110] Add core event to the page_footer() function
2014-10-02 15:38:22 +02:00
Joas Schilling
994a0dcd4c Merge branch 'ticket/12985' into develop-ascraeus 2014-10-01 10:09:29 +02:00
david63
5314c2bddf [ticket/12985] Add core.login_box_redirect
Add core.login_box_redirect core event to allow extensions to redirect a
user to a specific page when logging in.

PHPBB3-12985
2014-10-01 10:09:10 +02:00
Tristan Darricau
3a413cbf30 [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders
PHPBB3-13120
2014-09-30 21:20:42 +02:00
rxu
eb2aa1f83a [ticket/13110] Add core event to the page_footer() function
Add core event to the page_footer() in includes/functions.php to allow
extensions handling overall page output before its displaying.

PHPBB3-13110
2014-09-28 15:39:06 +08:00
Joas Schilling
85bc9b69ae Merge pull request #2844 from marc1706/ticket/12858
[ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
2014-09-24 13:47:59 +02:00
Dhruv Goel
84e68b3a73 Merge pull request #2963 from Senky/ticket/13045
[ticket/13045] Remove Pragma headers
2014-09-21 11:29:56 +05:30
Marc Alexander
457e13634e [ticket/12858] Properly format UTC offset in footer
PHPBB3-12858
2014-09-19 23:45:03 +02:00
Marc Alexander
6fd54436ee [ticket/13073] Add path regex to get_preg_expression() and add unit tests
We're now calling get_preg_expression() instead of hardcoding the regex into
the helper route method.

PHPBB3-13073
2014-09-19 13:54:15 +02:00
Jakub Senko
e59222496a [ticket/13045] Remove Pragma headers
PHPBB3-13045
2014-09-17 20:10:01 +02:00
Marc Alexander
f4761b5e08 [ticket/12858] Directly return and use timezone selects
PHPBB3-12858
2014-09-17 19:07:24 +02:00
Jakub Senko
3d637fea98 [ticket/13044] Move GMT out of gmdate()
PHPBB3-13044
2014-09-17 18:35:38 +02:00
Marc Alexander
9c310f789f [ticket/12858] Rename tz_ prefixed block variables to timezone_ prefix
PHPBB3-12858
2014-09-17 17:56:09 +02:00
Marc Alexander
9a3aeb8a99 [ticket/12858] Remove hardcoded language entries from timezone selects
PHPBB3-12858
2014-09-17 17:56:04 +02:00
Marc Alexander
3dbac0f88b [ticket/12858] Use UTC for time info in footer and hide offset if it's 0
PHPBB3-12858
2014-09-17 14:23:34 +02:00
Marc Alexander
9ebee7de32 [ticket/12858] Generate timezone selects with template loop
PHPBB3-12858
2014-09-17 14:22:08 +02:00
Jakub Senko
7cbd9e9524 [ticket/13044] move GMT string out of gmdate()
PHPBB3-13044
2014-09-17 11:15:24 +02:00