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

16986 Commits

Author SHA1 Message Date
Joseph Warner
80eb95bbb7 [ticket/11626] LDAP Auth ACP Template File
PHPBB3-11626
2013-07-11 15:49:45 -04:00
Joseph Warner
b0e6b1dd98 [ticket/11626] Create get_acp_template method for auth providers
PHPBB3-11626
2013-07-11 15:49:45 -04:00
Joseph Warner
9c0495664d [feature/auth-refactor] Remove invalid providers from acp select
PHPBB3-9734
2013-07-11 15:46:08 -04:00
Joseph Warner
e2435f25d9 [feature/auth-refactor] Check that providers implement auth interface
PHPBB3-9734
2013-07-11 14:54:52 -04:00
Joseph Warner
e674838d69 [feature/auth-refactor] Remove full stop
PHPBB3-9734
2013-07-11 12:07:00 -04:00
Joseph Warner
177e340764 [feature/auth-refactor] Code style fix for doc blocks
PHPBB3-9734
2013-07-11 11:31:50 -04:00
Joseph Warner
ccef1ae5ab [feature/auth-refactor] Change 'must' to 'should'
PHPBB3-9734
2013-07-11 11:27:20 -04:00
Joseph Warner
021eb083ab [feature/auth-refactor] Remove implements on classes extending base
PHPBB3-9734
2013-07-11 11:09:45 -04:00
Joseph Warner
69c1b1aea8 [feature/auth-refactor] Prevent fatal error in php < 5.3.23
PHPBB3-9734
2013-07-11 11:06:59 -04:00
Joseph Warner
3c11052fb3 [feature/auth-refactor] Have a base auth class
PHPBB3-9734
2013-07-11 10:56:04 -04:00
Andreas Fischer
2fcae1ca16 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11630] Improvements to the PHP lint pre-commit hook
2013-07-11 00:51:07 +02:00
Andreas Fischer
13c087d4f1 Merge remote-tracking branch 'EXreaction/ticket/11630' into develop-olympus
* EXreaction/ticket/11630:
  [ticket/11630] Improvements to the PHP lint pre-commit hook
2013-07-11 00:50:05 +02:00
Matthew Fonda
300867ab1a [ticket/11630] Improvements to the PHP lint pre-commit hook
The PHP lint pre-commit hook fails to display any output when an error
other than a parse error is decteced.

Additionally, the hook may not display any meaningful output depending
on php.ini settings. This commit removes the dependency on php.ini.

PHPBB3-11630
2013-07-06 12:16:59 -05:00
Nathan Guse
2d7a91ebd6 Merge remote-tracking branch 'remotes/imkingdavid/ticket/11253' into develop
# By David King
# Via David King
* remotes/imkingdavid/ticket/11253:
  [ticket/11253] Put AND clause in correct SQL query
  [ticket/11253] Fix a few things brought up in the PR
  [ticket/11253] Fix typo in constant
  [ticket/11253] Add migration to add auth check to UCP signature module
2013-07-06 11:15:04 -05:00
Nathan Guse
e03586f2cf Merge branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathan Guse (1)
* develop-olympus:
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
2013-07-05 18:21:38 -05:00
Nathan Guse
7c84a12f39 Merge remote-tracking branch 'remotes/bantu/ticket/11619' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11619:
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
2013-07-05 18:21:01 -05:00
Andreas Fischer
4aef3d0ab9 Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into develop
* Hardolaf/feature/auth-refactor:
  [feature/auth-refactor] Move auth providers to separate directory
2013-07-05 16:06:07 +02:00
Joseph Warner
5746c8d96f [feature/auth-refactor] Move auth providers to separate directory
Moves the provider files to their own directory per bantu's
suggestion.

PHPBB3-9734
2013-07-04 17:14:19 -04:00
Andreas Fischer
b3487b3167 Merge remote-tracking branch 'VSEphpbb/ticket/11577' into develop
* VSEphpbb/ticket/11577:
  [ticket/11577] Readjust min-height to 35px
  [ticket/11577] Correct over-sized Topic Rows
2013-07-03 22:56:30 +02:00
David King
73c289ae49 Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into develop
* Hardolaf/feature/auth-refactor: (44 commits)
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [feature/auth-refactor] A possible fix for the functional test failures
  [feature/auth-refactor] Forgot @inheritdoc on methods
  [feature/auth-refactor] Finish and clean up documentation
  [feature/auth-refactor] Change phpEx to php_ext in new classes
  [feature/auth-refactor] Fix two session tests broken by changes
  [feature/auth-refactor] Removed no longer used variable
  [feature/auth-refactor] Fix errors in acp_board
  [feature/auth-refactor] Fix indentation on acp_board
  [feature/auth-refactor] Refactor auth in acp_board
  [feature/auth-refactor] Don't truncate name then reattach same thing
  [feature/auth-refactor] Remove old auth plugins
  [feature/auth-refactor] Remove references to old auth plugins
  [feature/auth-refactor] Fix auth tests to use mock objects correctly
  [feature/auth-refactor] Test validate_session on provider_apache
  [feature/auth-refactor] Test autologin() on provider_apache
  [feature/auth-refactor] Test login() for provider_apache
  [feature/auth-refactor] Test for init on provider_apache
  ...
2013-07-03 12:46:18 -04:00
Andreas Fischer
9e845d4641 [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
PHPBB3-11619
2013-07-03 15:31:40 +02:00
Andreas Fischer
950a3a7d95 [ticket/11619] Some tests for get_remote_file().
PHPBB3-11619
2013-07-03 15:31:24 +02:00
Joas Schilling
8ce7d36f70 Merge remote-tracking branch 'dhruvgoel92/ticket/11437' into develop
* dhruvgoel92/ticket/11437:
  [ticket/11437] avoid $start becoming negative when no search results are found
2013-07-03 11:51:28 +02:00
Andreas Fischer
3c3f203f14 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
2013-07-03 04:03:39 +02:00
Andreas Fischer
44de24f1b8 Merge remote-tracking branch 'VSEphpbb/ticket/11617' into develop-olympus
* VSEphpbb/ticket/11617:
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
2013-07-03 04:03:22 +02:00
Matt Friedman
5ef4987ffe [ticket/11617] Remove spaces and tabs from empty lines
PHPBB3-11617
2013-07-02 18:47:56 -07:00
Matt Friedman
fba3a9d600 [ticket/11617] Missing U_ACTION in acp_captcha.php
http://tracker.phpbb.com/browse/PHPBB3-11617

PHPBB3-11617
2013-07-02 16:52:15 -07:00
Joseph Warner
f9672e9b45 [feature/auth-refactor] Fix code style issue
PHPBB3-9734
2013-07-02 14:03:43 -04:00
Joas Schilling
f1b057102d Merge branch 'develop-olympus' into develop
* develop-olympus:
2013-07-02 13:08:58 +02:00
Joas Schilling
ec4a43c91c Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/11566-develop' into develop
* remotes/dhruvgoel92/ticket/11566-develop:
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha
2013-07-02 13:07:53 +02:00
Joas Schilling
d4531c9cea Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/11566' into develop-olympus
* remotes/dhruvgoel92/ticket/11566:
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha
2013-07-02 13:07:14 +02:00
Joseph Warner
2743081489 [feature/auth-refactor] Fix comment grammar
PHPBB3-9734
2013-07-02 00:04:32 -04:00
Joseph Warner
f48effb001 [feature/auth-refactor] Fix the actual cause of test failures
Enables super globals before the new container is instantiated in
the final step of installation to prevent issues caused by trying
to create a phpbb_request object when super globals are disabled.

PHPBB3-9734
2013-07-01 22:40:49 -04:00
Andreas Fischer
fb777b3e20 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/10838] Updated RUNNING_TESTS.md
2013-07-01 21:23:07 +02:00
Andreas Fischer
1a292750f2 Merge remote-tracking branch 'dhruvgoel92/ticket/10838' into develop-olympus
* dhruvgoel92/ticket/10838:
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/10838] Updated RUNNING_TESTS.md
2013-07-01 21:22:51 +02:00
Dhruv
440986dc3f [ticket/10838] Fix URL for wiki and remove irrelevant line
PHPBB3-10838
2013-07-02 00:50:16 +05:30
Dhruv
89393e11e8 [ticket/10838] Remove php 5.4 and builtin server references
PHPBB3-10838
2013-07-02 00:50:15 +05:30
Dhruv
9c9f09d640 [ticket/10838] Fix missing data
PHPBB3-10838
2013-07-02 00:50:14 +05:30
Dhruv
5ed4dbb5b7 [ticket/10838] separate database used mentioned in unit tests
Separate database used for tests which is deleted each time
tests are run information is added to unit tests.

PHPBB3-10838
2013-07-02 00:47:32 +05:30
Andreas Fischer
60e474c551 Merge remote-tracking branch 'dhruvgoel92/ticket/11585' into develop
* dhruvgoel92/ticket/11585:
  [ticket/11585] Make $auth_admin class property
2013-07-01 20:43:34 +02:00
Dhruv
9e3d5420ad [ticket/11585] Make $auth_admin class property
$auth_admin is class property and used via $this reference in all
methods

PHPBB3-11585
2013-07-02 00:10:30 +05:30
Dhruv
c80b80ca0f Merge branch 'ticket/11566' into ticket/11566-develop
* ticket/11566:
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha

Conflicts:
	phpBB/report.php
2013-07-01 23:25:29 +05:30
Joseph Warner
66118ea49e [feature/auth-refactor] A possible fix for the functional test failures
I don't like this fix as it really shouldn't be needed. But it
makes the functional tests pass.

PHPBB3-9734
2013-07-01 13:33:14 -04:00
Dhruv
045e04fb6f [ticket/11566] Subsilver template error displayed after table headers
PHPBB3-11561
2013-07-01 21:54:47 +05:30
Dhruv
d4645575fd [ticket/11566] Remove extra pair of brackets from conditional statement
PHPBB3-11566
2013-07-01 21:54:34 +05:30
Dhruv
84ec1f5423 [ticket/11566] Check that guest doesn't have reporting permission by default
PHPBB3-11566
2013-07-01 21:49:06 +05:30
Dhruv
ea8a4abe66 [ticket/11566] Add captcha to report post template in subsilver
PHPBB3-11566
2013-07-01 21:49:05 +05:30
Dhruv
4ad1d9aa65 [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
PHPBB3-11566
2013-07-01 21:49:04 +05:30
Dhruv
88b5180aa1 [ticket/11566] Rename var to $visual_confirmation_response
PHPBB3-11566
2013-07-01 21:49:02 +05:30
Dhruv
434d14e1d5 [ticket/11566] Revert forum permission changes
Revert the f_report permission for guests in the functional tests

PHPBB3-11566
2013-07-01 21:49:01 +05:30