1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

131 Commits

Author SHA1 Message Date
Tristan Darricau
fa5afb60aa [ticket/12726] Ensure PHP files do not contain any unused use statements
PHPBB3-12726
2014-06-22 23:52:16 +02:00
Tristan Darricau
09fc008e62 [ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy
PHPBB3-12721
2014-06-16 22:35:41 +02:00
Tristan Darricau
d7b9e33b94 [ticket/12715] Cleanup comments in \phpbb\auth\provider\*
PHPBB3-12715
2014-06-15 16:39:28 +02:00
Marc Alexander
94b2b64ca1 [ticket/12352] Update file headers to fit new format
PHPBB3-12352
2014-06-01 21:36:53 +02:00
Marc Alexander
6f5f0d6d8d [ticket/12352] Use custom provider collection for auth providers
Using this custom provider collection, we can properly check whether the
configured auth provider does exist. The method get_provider() has been added
for returning the default auth provider or the standard db auth provider if
the specified one does not exist.
Additionally, the method get_provider() will throw an RuntimeException if
none of the above exist.

PHPBB3-12352
2014-06-01 21:31:06 +02:00
Marc Alexander
4698f6928e [ticket/12352] Remove usages of user_pass_convert column
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
60cb648ab0 [ticket/12352] Remove code for converting passwords in db auth provider
PHPBB3-12352
2014-06-01 21:31:04 +02:00
Marc Alexander
ed1d4fe4a0 [ticket/12352] Revert to db auth provider if default does not exist
This will make sure that we will not encounter a non-existing auth provider.
We will revert to the default db auth provider if the one set in the config
does not exist in our auth provider collection.

PHPBB3-12352
2014-06-01 21:31:04 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
Joas Schilling
11a9104b8a [ticket/12282] Use interface for type hinting
PHPBB3-12282
2014-04-01 19:17:41 +02:00
Marc Alexander
2c9e6f196b [ticket/12156] Add missing passwords manager to oauth
PHPBB3-12156
2014-02-03 18:08:13 +01:00
Marc Alexander
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
Marc Alexander
ac131a5159 [feature/passwords] Fix indentation in auth providers
PHPBB3-11610
2013-12-28 16:56:20 +01:00
Andreas Fischer
7aa8f6461f [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.
PHPBB3-11980
2013-10-30 13:05:28 +01:00
Marc Alexander
7f58a4572e [ticket/11981] Fix code sniffer complaints
PHPBB3-11981
2013-10-28 23:05:46 +01:00
Marc Alexander
bb836b65e3 [feature/passwords] Integrate convert_flag with db auth provider
PHPBB3-11610
2013-10-25 15:21:09 +02:00
Andreas Fischer
d310c17c7f [ticket/11908] Namespacify phpbb_auth_provider_oauth_service_exception.
PHPBB3-11908
2013-10-11 14:52:07 +02:00
Marc Alexander
356f3eef07 [feature/passwords] Inject passwords manager into auth providers
The passwords manager will replace the old method of using the functions
phpbb_hash() and phpbb_check_hash().

PHPBB3-11610
2013-10-02 13:28:38 +02:00
Nils Adermann
06e7c84235 [ticket/11700] Fix some more incorrectly changed comments
PHPBB3-11700
2013-09-19 15:27:03 +02:00
Nils Adermann
1d7f8f8193 [ticket/11700] Get functional tests running after develop merge
PHPBB3-11700
2013-09-17 18:10:58 +02:00
Nils Adermann
d905358e2b [ticket/11700] Fix leftover backslashes in comments
PHPBB3-11700
2013-09-16 05:20:27 +02:00
Nils Adermann
d626ebaf1e [ticket/11700] Fix a few more comments
PHPBB3-11700
2013-09-16 04:45:58 +02:00
Nils Adermann
acea8f5c0a [ticket/11700] The word "them" in a comment is not a class
PHPBB3-11700
2013-09-16 03:51:42 +02:00
Nils Adermann
3860b37741 [ticket/11700] Actually "one" in comments is not a class
PHPBB3-11700
2013-09-16 03:50:47 +02:00
Nils Adermann
1fa673bded [ticket/11700] Fix authentication acp after develop merge
PHPBB3-11700
2013-09-16 03:22:13 +02:00
Nils Adermann
2472271bc0 [ticket/11700] Fix tests after merging new develop code
PHPBB3-11700
2013-09-16 02:41:03 +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
b95fdacdd3 [ticket/11700] Move all recent code to namespaces
PHPBB3-11700
2013-09-16 00:25:27 +02:00
Joseph Warner
29e3768ecc [feature/oauth] More minor changes from review
PHPBB3-11673
2013-09-02 16:47:53 -04:00
Joseph Warner
63ba064065 [feature/oauth] Fix small bug introduced by update in OAuth library
PHPBB3-11673
2013-09-02 16:32:40 -04:00
Joseph Warner
6420fdcc05 [feature/oauth] Fix typo in OAuth logout method
PHPBB3-11673
2013-09-02 16:04:46 -04:00
Joseph Warner
4348fd8350 [feature/oauth] Make token storage service ignorant
PHPBB3-11673
2013-09-02 16:04:35 -04:00
Joseph Warner
a2be0aab5f [feature/oauth] Update oauth::logout() to use clearAllTokens()
PHPBB3-11673
2013-09-02 16:04:24 -04:00
Joseph Warner
6df2bd4fd3 [feature/oauth] Update storage implementation due to inteface change
PHPBB3-11673
2013-09-02 16:04:15 -04:00
Joseph Warner
2090a5020c [feature/oauth] Update comment on oauth service exception
PHPBB3-16673
2013-08-24 22:17:29 -04:00
Joseph Warner
265a3a3552 [feature/oauth] Forgot to remove placeholder comment
PHPBB3-11673
2013-08-24 22:15:08 -04:00
Joseph Warner
7f6b2a9849 [feature/oauth] OAuth service exception
PHPBB3-11673
2013-08-24 22:14:21 -04:00
Joseph Warner
d847df7175 [feature/oauth] A few more minor changes
PHPBB3-11673
2013-08-24 22:10:34 -04:00
Joseph Warner
a8ffbce99f [feature/oauth] Changes due to code review
PHPBB3-11673
2013-08-24 22:04:04 -04:00
Joseph Warner
310caec5d9 [feature/oauth] Fix redirects
PHPBB3-11673
2013-08-24 21:34:37 -04:00
Joseph Warner
d398ae41c0 [feature/oauth] Finish cleaning up TODOs
PHPBB3-11673
2013-08-24 17:20:19 -04:00
Joseph Warner
27ba57747a [feature/oauth] Clean up TODOs
PHPBB3-11673
2013-08-24 17:17:31 -04:00
Joseph Warner
83515cd3d4 [feature/oauth] Fix remaining issues with token storage
PHPBB3-11673
2013-08-15 01:14:53 -04:00
Joseph Warner
0ea555bbc7 [feature/oauth] Update auth provider interface
PHPBB3-11673
2013-08-14 17:16:00 -04:00
Joseph Warner
59c8db28d6 [feature/oauth] Always store session_id with token
PHPBB3-11673
2013-08-14 17:01:33 -04:00
Joseph Warner
823b7e2b84 [feature/oauth] Fix small error in method call
PHPBB3-11673
2013-08-14 16:59:01 -04:00
Joseph Warner
abebe83edb [feature/oauth] No need for this line
PHPBB3-11673
2013-08-14 16:52:55 -04:00
Joseph Warner
7bd4c88ec5 [feature/oauth] Fix errors in oauth
PHPBB3-11673
2013-08-14 16:45:31 -04:00
Joseph Warner
9cd80345ad [feature/oauth] Implement unlinking in OAuth
PHPBB3-11673
2013-08-14 16:33:10 -04:00
Joseph Warner
a2237ea8a7 [feature/oauth] Add unlink_account to auth interface
PHPBB3-11673
2013-08-14 16:21:06 -04:00