1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-08 08:35:31 +02:00

1280 Commits

Author SHA1 Message Date
Marc Alexander
d43542a434 [ticket/11997] Use $phpbb_filesystem->clean_path() for proper redirect paths
PHPBB3-11997
2013-11-12 00:46:43 +01:00
Marc Alexander
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
Marc Alexander
6bb9bce40e [ticket/11997] Remove obsolete if statement in phpbb_own_realpath()
PHPBB3-11997
2013-11-10 12:56:09 +01:00
Marc Alexander
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
Nathan Guse
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
Dhruv
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
Nils Adermann
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
Joas Schilling
2086db0d7a [ticket/11974] Translate all timezones
PHPBB3-11974
2013-10-27 00:21:17 +02:00
Cesar G
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
Matt Friedman
ab8ac5e284 [ticket/11921] Directly inject unread messages count into the template
PHPBB3-11921
2013-10-16 10:26:33 -07:00
Matt Friedman
bd58c31ee0 [ticket/11921] Only get the count of unread PMs
PHPBB3-11921
2013-10-16 10:08:29 -07:00
Matt Friedman
2867831232 [ticket/11921] Move any HTML for Notifications to the templates
PHPBB3-11921
2013-10-16 10:07:54 -07:00
Joas Schilling
3c9a8a3788 [ticket/11924] Fix some minor issues with the php event docs
PHPBB3-11924
2013-10-16 16:32:40 +02:00
Matt Friedman
457ca9c763 [ticket/11921] Remove "l_" from non-lang variables
PHPBB3-11921
2013-10-15 14:09:47 -07:00
Matt Friedman
8608204097 [ticket/11921] Improve appearance of PM notifications in linklist
PHPBB3-11921
2013-10-15 10:29:15 -07:00
Nils Adermann
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
Nathan Guse
ac9225774e [ticket/11874] Correct when $phpbb_root_path is appended to build_url()
PHPBB3-11874
2013-10-10 16:41:31 -05:00
Andreas Fischer
a409d39881 [ticket/11703] Also use empty() for T_JQUERY_LINK.
PHPBB3-11703
2013-10-10 23:30:29 +02:00
Andreas Fischer
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
Nathaniel Guse
e1ed30a408 [ticket/11898] Correct admin S_LOGIN_ACTION
PHPBB3-11898
2013-10-09 10:18:14 -05:00
Nathan Guse
179f41475b Merge pull request #1735 from nickvergessen/ticket/11852
Ticket/11852 filesystem class must not depend on a web request
2013-09-30 16:21:02 -07:00
Andreas Fischer
787784e083 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.12] Update changelog for 3.0.12 release.
  [ticket/11873] Add unit test for large password input.
  [ticket/11873] Do not hash very large passwords in order to safe resources.
2013-09-28 15:02:59 +02:00
Joas Schilling
cba28c39ad [ticket/11873] Do not hash very large passwords in order to safe resources.
PHPBB3-11873
2013-09-28 03:12:50 +02:00
Joas Schilling
7525c49d45 [ticket/11852] Split filesystem and path_helper into 2 classes
PHPBB3-11852
2013-09-26 15:34:44 +02:00
David King
779688b56b Merge pull request #1733 from nickvergessen/ticket/11866
Ticket/11866 Fix some more namespace issues
2013-09-25 16:49:12 -07:00
Joas Schilling
03639c081c [ticket/11866] Update some occurances of phpbb_db_ to new Namespace
PHPBB3-11866
2013-09-26 00:42:04 +02:00
Joas Schilling
6fd6324dd6 [ticket/11805] Move page-url generating code into a new function
PHPBB3-11805
2013-09-25 17:34:48 +02:00
Joas Schilling
cf46487dea [ticket/11805] Do not generate the same link twice
There is no need to generate the prev/next links twice

PHPBB3-11805
2013-09-25 17:34:30 +02:00
Joas Schilling
0abb4a5ad3 [ticket/11805] Allow specifying the page in the route for pagination
Instead of "app.php?controller=news&start=10" authors might prefer having
the pagination in the route. So the sample link from above would be the
same as "app.php?controller=news/page/2". With this patch that is easily
possible. What you do is, you specify the $base_url and $start_name as follows:

	$base_url = $controller_helper->url('news/page/%d');
	$start_name = '/page/%d'; // Part of the url that will be removed
				  // for page 1

Now this will generate:
	"news"		for start = 0
		"news/page/1" will work aswell, but will not be created
	"news/page/2"	for start = 10

PHPBB3-11805
2013-09-25 17:34:28 +02:00
Nils Adermann
1adcbccc09 [ticket/11700] Replace some leftover phpbb_filesystem uses
PHPBB3-11700
2013-09-17 18:56:47 +02:00
Nils Adermann
9d8ac2b0ce [ticket/11700] Fix unit tests after develop merge
PHPBB3-11700
2013-09-17 17:12:41 +02:00
Nils Adermann
f039a3308a Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700
* github-phpbb/develop:
  [ticket/11832] Correct paths in tests
  [ticket/11832] Correct ROOT_PATH variable
  [ticket/11832] get_url() from phpbb_template_asset should return web path
  [ticket/11832] Fix INCLUDE(JS/CSS)
  [ticket/11832] Fix constructions of phpbb_filesystem
  [ticket/11832] Fix smiley paths
  [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
  [ticket/11832] Fix build_url and the S_LOGIN_ACTION
  [ticket/11832] Changing comments to say app.php rather than index.php
  [ticket/11832] We must instantiate the $phpbb_filesystem in common
  [ticket/11832] Fix the web path corrections
  [ticket/11832] More extensive testing
  [ticket/11832] Use dirname(__FILE__)
  [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
  Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
  [ticket/11832] Make $phpbb_container a global initiated by the framework
  [ticket/11832] Fix log tests
  [ticket/11832] update_web_root_path helper and tests
  [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)

Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
	phpBB/includes/bbcode.php
	phpBB/includes/functions.php
	phpBB/includes/functions_messenger.php
	phpBB/install/index.php
	phpBB/phpbb/filesystem.php
	phpBB/phpbb/template/twig/environment.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/dbal/migrator_test.php
	tests/extension/manager_test.php
	tests/extension/metadata_manager_test.php
	tests/filesystem/clean_path_test.php
	tests/mock/extension_manager.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
2013-09-17 16:56:50 +02:00
Joas Schilling
6ba2fb6d62 Merge remote-tracking branch 'EXreaction/ticket/11832' into develop
* EXreaction/ticket/11832:
  [ticket/11832] Correct paths in tests
  [ticket/11832] Correct ROOT_PATH variable
  [ticket/11832] get_url() from phpbb_template_asset should return web path
  [ticket/11832] Fix INCLUDE(JS/CSS)
  [ticket/11832] Fix constructions of phpbb_filesystem
  [ticket/11832] Fix smiley paths
  [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
  [ticket/11832] Fix build_url and the S_LOGIN_ACTION
  [ticket/11832] Changing comments to say app.php rather than index.php
  [ticket/11832] We must instantiate the $phpbb_filesystem in common
  [ticket/11832] Fix the web path corrections
  [ticket/11832] More extensive testing
  [ticket/11832] Use dirname(__FILE__)
  [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
  Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
  [ticket/11832] Make $phpbb_container a global initiated by the framework
  [ticket/11832] Fix log tests
  [ticket/11832] update_web_root_path helper and tests
  [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)
2013-09-16 21:33:52 +02:00
Nils Adermann
21bbb58503 Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700
* github-phpbb/develop: (586 commits)
  [ticket/11735] Display disabled checkbox in subsilver for read notifications
  [ticket/11735] Display disabled checkbox when notification is already read
  [ticket/11844] update acp/authentication language var
  [ticket/11795] Remove PM popup
  [ticket/11795] Remove outdated comment from forum_fn.js
  [ticket/11795] Move find user JS to forum_fn
  [ticket/11795] Replace TWIG with phpBB syntax in ACP
  [ticket/11795] Move MSN scripts to forum_fn.js
  [ticket/11795] Use phpBB template syntax instead of TWIG
  [ticket/11795] Move PM popup JS to forum_fn.js
  [ticket/11795] Get rid of pagination JS variables
  [ticket/11795] Get rid of onload_functions
  [ticket/11795] Use data-reset-on-edit attr to reset elements
  [ticket/11795] Redo form elements auto-focus
  [ticket/11811] Remove outline on :focus
  [ticket/11836] Fix subsilver fatal error
  [ticket/11837] Replace escaped single quote with utf-8 single quote
  [ticket/11836] Fix fatal error on unsupported provider for auth link
  [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
  [ticket/11809] Ensure code.js is first script included after jQuery
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/develop/create_schema_files.php
	phpBB/develop/mysql_upgrader.php
	phpBB/download/file.php
	phpBB/includes/bbcode.php
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/phpbb/controller/helper.php
	phpBB/phpbb/controller/resolver.php
	phpBB/phpbb/request/request_interface.php
	phpBB/phpbb/session.php
	phpBB/phpbb/style/extension_path_provider.php
	phpBB/phpbb/style/path_provider.php
	phpBB/phpbb/style/path_provider_interface.php
	phpBB/phpbb/style/resource_locator.php
	phpBB/phpbb/style/style.php
	phpBB/phpbb/template/locator.php
	phpBB/phpbb/template/template.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/node/includecss.php
	phpBB/phpbb/template/twig/node/includejs.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/di/create_container_test.php
	tests/extension/style_path_provider_test.php
	tests/notification/notification_test.php
	tests/session/continue_test.php
	tests/session/creation_test.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
2013-09-16 01:24:05 +02:00
Nils Adermann
d297eb4aec [ticket/11700] Get the installer to run with namespaces
PHPBB3-11700
2013-09-16 00:41:38 +02:00
Nils Adermann
b95fdacdd3 [ticket/11700] Move all recent code to namespaces
PHPBB3-11700
2013-09-16 00:25:27 +02:00
Nathan Guse
8e02f9bd7d [ticket/11832] Correct ROOT_PATH variable
PHPBB3-11832
2013-09-15 16:44:09 -05:00
Vjacheslav Trushkin
22c8df5403 [ticket/11795] Move PM popup JS to forum_fn.js
Move PM popup JavaScript from overall_header to forum_fn.js
Use TWIG to escape PM popup URL

PHPBB3-11795
2013-09-14 10:10:43 +03:00
Vjacheslav Trushkin
4c2aad4ca9 [ticket/11795] Get rid of pagination JS variables
Move pagination variables to data attributes
Replace A_BASE_URL with BASE_URL and use TWIG to escape it

PHPBB3-11795
2013-09-14 10:10:43 +03:00
Nathan Guse
b4a374dc73 [ticket/11832] Fix INCLUDE(JS/CSS)
PHPBB3-11832
2013-09-13 10:58:03 -05:00
Nathan Guse
21624e79fc [ticket/11832] Fix constructions of phpbb_filesystem
PHPBB3-11832
2013-09-13 10:04:35 -05:00
Nathan Guse
aa710df2db [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
Now symfony_request is also a service (removed the function
phpbb_create_symfony_request).

Inject symfony request into filesystem

Cleanup for the tests

PHPBB3-11832
2013-09-13 09:52:02 -05:00
Nathan Guse
934786d45d [ticket/11832] Fix build_url and the S_LOGIN_ACTION
PHPBB3-11832
2013-09-12 12:30:16 -05:00
Nathan Guse
d9fdf41ad8 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832
# By Joseph Warner (187) and others
# Via Andreas Fischer (2) and others
* 'develop' of github.com:phpbb/phpbb3: (189 commits)
  [ticket/11835] Fix ucp_auth_link adding in migration
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
  [feature/oauth] Fix tabindex
  [feature/oauth] Fix bug on ucp_auth_link related to error display
  [feature/oauth] More small fixes
  [feature/oauth] More minor changes from review
  [feature/oauth] Fix small bug introduced by update in OAuth library
  [feature/oauth] Fix small issues on ucp pages
  [feature/oauth] Fix typo in OAuth logout method
  [feature/oauth] Make token storage service ignorant
  [feature/oauth] Update oauth::logout() to use clearAllTokens()
  [feature/oauth] Update storage implementation due to inteface change
  [feature/oauth] Update lusitanian/oauth to stable branch
  [feature/oauth] Update comment on oauth service exception
  [feature/oauth] Forgot to remove placeholder comment
  [feature/oauth] OAuth service exception
  [feature/oauth] A few more minor changes
  [feature/oauth] Changes due to code review
  [feature/oauth] Fix redirects
  [feature/oauth] Fix issues on ucp_login_link from review
  ...
2013-09-12 11:56:36 -05:00
Joseph Warner
18f6a16101 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth 2013-09-10 16:19:39 -04:00
Nathan Guse
3684d8e971 [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
PHPBB3-11832
2013-09-10 10:13:26 -05:00
Nathan Guse
6692db892f [ticket/11832] update_web_root_path helper and tests
PHPBB3-11832
2013-09-09 18:19:50 -05:00
Nathan Guse
f30b87519e [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)
Function moved from phpbb_get_web_root_path to filesystem::get_web_root_path

PHPBB3-11832
2013-09-09 17:28:56 -05:00
Vjacheslav Trushkin
07632d46fc [ticket/develop/11832] Fix path detection
Clean up path, do not count first /

PHPBB3-11832
2013-09-09 20:52:29 +03:00
Joseph Warner
3a6b3d7c2b [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth
Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
	phpBB/develop/create_schema_files.php
	phpBB/includes/ucp/ucp_register.php

PHPBB3-11673
2013-09-06 20:35:54 -04:00