1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-09 11:24:35 +02:00
Commit Graph

1312 Commits

Author SHA1 Message Date
7b08a483fd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12202] Use an array in the data provider instead of exploding manually
  [ticket/12202] Can't call htmlspecialchars before checking for quotes
  [ticket/12202] Fix tests
  [ticket/12202] Test for parse_cfg_file
  [ticket/12202] Use copyright symbol in style.cfg files
  [ticket/12202] Apply htmlspecialchars to style.cfg data

Conflicts:
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2014-03-14 13:55:53 +01:00
d69012ea6d Merge pull request #2104 from nickvergessen/ticket/12261
[ticket/12261] Remove web root path from login redirect url
2014-03-12 18:48:41 -05:00
e8fdc1545a [ticket/12261] Add a functional test for redirect after using login_box()
PHPBB3-12261
2014-03-10 12:35:30 +01:00
b876c07377 [ticket/12261] Remove web root path from login redirect url
The redirect url must be relative to the ucp.php and not relative to the
current page.

PHPBB3-12261
2014-03-10 10:15:38 +01:00
f3d8dfd1e3 [ticket/12202] Can't call htmlspecialchars before checking for quotes
PHPBB3-12202
2014-03-09 17:17:33 -05:00
f2d3879da4 [ticket/12202] Apply htmlspecialchars to style.cfg data
PHPBB3-12202
2014-03-09 15:19:52 -05:00
1cf8554d0e [ticket/12250] Remove deprecated phpbb_clean_path function
The function phpbb_clean_path() in functions.php is deprecated as is not
used used 3.0/3.1 core

PHPBB3-12250
2014-03-06 23:51:49 +05:30
6251ca1459 [ticket/12239] Move deprecated passwords functions to compatibility file
The deprecated passwords functions are no longer used in the core and have
been replaced with the passwords manager. Therefore, the functions are
moved to the functions_compatibility file.

PHPBB3-12239
2014-03-06 09:43:52 +01:00
f8d6a07392 Merge pull request #1716 from marc1706/feature/passwords
[feature/passwords] Add password hashing manager with support for newer hashing algorithms
2014-02-02 06:26:35 -08:00
3e84fb76a3 Merge remote-tracking branch 'Marc/ticket/11997' into develop
* Marc/ticket/11997: (23 commits)
  [ticket/11997] Use functional test cases that should always work
  [ticket/11997] Fix redirect tests for mod rewrite
  [ticket/11997] Add user's page dir to redirect path and fix unit tests for it
  [ticket/11997] Remove obsolete function get_controller_redirect_url()
  [ticket/11997] Use path_helper in in foo/bar extension for redirect URLs
  [ticket/11997] Add remove_web_root_path() in order to prevent incorrect URLs
  [ticket/11997] Do not check if file or dir we redirect to exist
  [ticket/11997] Modifiy tests after adding path_helper clean_url method
  [ticket/11997] Add clean_url() method to path_helper
  [ticket/11997] Allow redirects to parent folders like previously
  [ticket/11997] Move expected redirect returns to controller and output to HTML
  [ticket/11997] Fix tests for path_helper's get_controller_redirect_url()
  [ticket/11997] Use get_controller_redirect_url() in redirect() function
  [ticket/11997] Add method for controller redirect URLs to path helper
  [ticket/11997] Undo changes to phpbb_own_realpath()
  [ticket/11997] Remove obsolete failover_flag in function redirect()
  [ticket/11997] Add functional test for redirects in controller
  [ticket/11997] Fix missing global
  [ticket/11997] Fix redirects from inside controllers
  [ticket/11997] Use $phpbb_filesystem->clean_path() for proper redirect paths
  ...
2014-01-08 16:17:48 +01:00
f4b832a27d [ticket/12034] AJAXify notifications popup.
PHPBB3-12034
2013-12-30 11:12:15 -08:00
85f1e8afa5 [feature/passwords] Correct docblock of phpbb_hash() function
PHPBB3-11610
2013-12-29 20:52:25 +01:00
382317b135 Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords
Conflicts:
	phpBB/config/services.yml
2013-12-29 13:46:42 +01:00
4c1569dd8a [ticket/11997] Add user's page dir to redirect path and fix unit tests for it
The user's page directory needs to be added to the redirect URL for proper
redirects outside of the forum root. Fix the unit tests accordingly.

PHPBB3-11997
2013-12-28 00:14:12 +01:00
a304d99b2b [ticket/11997] Add remove_web_root_path() in order to prevent incorrect URLs
Adding a call to this method to the redirect function will make sure that we
do not end up with incorrect URLs after using append_sid().

PHPBB3-11997
2013-12-27 17:50:17 +01:00
9161816267 [ticket/11997] Do not check if file or dir we redirect to exist
The redirect function will now properly redirect to where we want it to.
It will no longer try to check if the file or directory we redirect to exist.
This will ensure compatibility with the new routes.

PHPBB3-11997
2013-12-27 13:00:22 +01:00
d9358c26da [ticket/11997] Add clean_url() method to path_helper
This method will get rid of unnecessary . and .. in URLs.

PHPBB3-11997
2013-12-21 20:08:00 +01:00
235d2069e0 [ticket/11997] Allow redirects to parent folders like previously
Redirects to parent folders were possible with the previous redirect function.
This change will allow these redirects again.

PHPBB3-11997
2013-12-21 16:31:20 +01:00
a485184434 [ticket/11849] Remove pagination functions
The functions where changed in 3.1 anyway, so we can just delete them

PHPBB3-11849
2013-12-18 18:34:58 +01:00
47ea6bc9e6 Merge branch 'develop' of https://github.com/phpbb/phpbb into ticket/11997
Conflicts:
	tests/functional/fixtures/ext/foo/bar/config/services.yml
2013-12-07 13:32:19 +01:00
a7f2788c72 [ticket/11997] Use get_controller_redirect_url() in redirect() function
This method of path_helper will now be used instead of the previous hack
of the phpbb_own_realpath() function.

PHPBB3-11997
2013-12-07 13:25:04 +01:00
8370857f04 [ticket/11997] Undo changes to phpbb_own_realpath()
PHPBB3-11997
2013-12-07 13:20:40 +01:00
df7fa8e499 Merge pull request #1854 from Pico88/ticket/12005
[ticket/12005] Remove code responsible for PM popup completely
2013-11-21 14:01:23 -08:00
68db335468 [ticket/11997] Remove obsolete failover_flag in function redirect()
This flag is no longer needed as the failover is no longer needed.

PHPBB3-11997
2013-11-17 20:16:02 +01:00
0aed281676 [ticket/11997] Fix missing global
PHPBB3-11997
2013-11-13 11:30:41 +01:00
0a7db81426 [ticket/11997] Fix redirects from inside controllers
The redirect url currently uses the web root path. However as we prepend the
full board url later, we need to remove the relative web root path and prepend
the normal root path again. Otherwise redirects from inside routes will not
work as intended.

PHPBB3-11997
2013-11-13 11:30:13 +01:00
d43542a434 [ticket/11997] Use $phpbb_filesystem->clean_path() for proper redirect paths
PHPBB3-11997
2013-11-12 00:46:43 +01:00
2d0fb4d166 [ticket/11997] Rename root_dirs_size to superordinate_dirs_count
This variable name better fits what is done with it. A comment explaining
why 2 has to be subtracted from the size of root_dirs has also been added

PHPBB3-11997
2013-11-11 21:55:21 +01:00
6bb9bce40e [ticket/11997] Remove obsolete if statement in phpbb_own_realpath()
PHPBB3-11997
2013-11-10 12:56:09 +01:00
60dda5577d [ticket/11997] Correctly redirect to front controllers
We currently do a lot of checks in order to prevent users from getting to
a 404 page. However, this logic relies on checking if a file or folder exists.
Due to the front controllers and the URL rewriting in 3.1, it is no longer
possible to rely on existing files for redirecting. This patch will take
care of properly redirecting users to front controller files. An incorrect
link will cause users to get a 404 error though.

PHPBB3-11997
2013-11-08 23:12:42 +01:00
65fbf87ce7 [ticket/12005] Remove PM popup
PHPBB3-12005
2013-11-08 21:57:08 +01:00
25995e311c Merge pull request #1790 from prototech/ticket/11280
[ticket/11280] Prevent duplicate entry in forums_track table.
2013-11-02 12:10:19 -07:00
a9524d6e08 Merge remote-tracking branch 'nickvergessen/ticket/11974' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11974:
  [ticket/11974] Fix timezone names with underscores
  [ticket/11974] Translate all timezones
2013-10-30 22:43:25 +05:30
ed94e3c576 Merge pull request #1784 from nickvergessen/ticket/11924
[Ticket/11924] Add a script to export the events in wiki format
2013-10-28 14:53:59 -07:00
2086db0d7a [ticket/11974] Translate all timezones
PHPBB3-11974
2013-10-27 00:21:17 +02:00
403da5d38d [ticket/11280] Prevent duplicate entry in forums_track table.
Enforcing a time limit prevents all rows from being selected, thus a new row
is inserted resulting in a duplicate entry.

PHPBB3-11280
2013-10-16 23:56:45 -07:00
ab8ac5e284 [ticket/11921] Directly inject unread messages count into the template
PHPBB3-11921
2013-10-16 10:26:33 -07:00
bd58c31ee0 [ticket/11921] Only get the count of unread PMs
PHPBB3-11921
2013-10-16 10:08:29 -07:00
2867831232 [ticket/11921] Move any HTML for Notifications to the templates
PHPBB3-11921
2013-10-16 10:07:54 -07:00
3c9a8a3788 [ticket/11924] Fix some minor issues with the php event docs
PHPBB3-11924
2013-10-16 16:32:40 +02:00
457ca9c763 [ticket/11921] Remove "l_" from non-lang variables
PHPBB3-11921
2013-10-15 14:09:47 -07:00
8608204097 [ticket/11921] Improve appearance of PM notifications in linklist
PHPBB3-11921
2013-10-15 10:29:15 -07:00
e674313559 [feature/passwords] Use passwords.manager service in login_forum_box()
Additionally, unused variables have been removed from the globals and
the request class is now used instead of the request_var() function.

PHPBB3-11610
2013-10-13 16:09:55 +02:00
b795ce8b7d [feature/passwords] Remove obsolete hashing functions from functions.php
These hashing functions have been worked into the salted md5 driver.

PHPBB3-11610
2013-10-11 13:34:40 +02:00
da39707d16 [feature/passwords] Mark old hashing functions as deprecated
PHPBB3-11610
2013-10-11 13:34:15 +02:00
446dc9b47e Merge pull request #1764 from EXreaction/ticket/11874
[ticket/11874] Do not always prepend the web path; only replace phpbb_root_path
2013-10-10 15:54:58 -07:00
ac9225774e [ticket/11874] Correct when $phpbb_root_path is appended to build_url()
PHPBB3-11874
2013-10-10 16:41:31 -05:00
a409d39881 [ticket/11703] Also use empty() for T_JQUERY_LINK.
PHPBB3-11703
2013-10-10 23:30:29 +02:00
94b49d8a92 [ticket/11703] Make jQuery CDN switch more generic.
Config variable: load_jquery_cdn -> allow_cdn
Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN

PHPBB3-11703
2013-10-10 23:26:03 +02:00
e1ed30a408 [ticket/11898] Correct admin S_LOGIN_ACTION
PHPBB3-11898
2013-10-09 10:18:14 -05:00