Commit graph

15134 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
c4fbed251d [ticket/11566] add captcha reset and hidden fields
If captcha is solved and some other error pops up, store the
captcha in a hidden field.
Reset captcha if reporting the post is successful

PHPBB3-11566
2013-07-01 21:48:57 +05:30
Dhruv
2c240f8a7b [ticket/11566] display error instead of trigger_error
When the error report is empty display error
in the template instead of trigger_error

PHPBB3-11566
2013-07-01 21:48:56 +05:30
Dhruv
7c9a1cbca9 [ticket/11566] add error in template
Check if error exists, then display it
in the report post template.

PHPBB3-11566
2013-07-01 21:48:54 +05:30
Dhruv
eafd0ae29f [ticket/11566] add error functionality
add $error which stores the captcha error when captcha validation fails

PHPBB3-11566
2013-07-01 21:48:53 +05:30
Dhruv
7a2e3b4354 [ticket/11566] add interface for captcha
Add basic captcha template while reporting post
when the user is not a registered user.

PHPBB3-11566
2013-07-01 21:48:51 +05:30
Matt Friedman
5701c753a7 [ticket/11577] Readjust min-height to 35px
Changing min-height to 35px in order to get pixel-for-pixel accurate
height settings as before for topic-rows.

PHPBB3-11577
2013-06-29 12:17:12 -07:00
Joas Schilling
8233c3e340 Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into develop
* dhruvgoel92/ticket/9341:
  [ticket/9341] Assert that page doesnt contain next or prev page posts
  [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not
  [ticket/9341] remove PREV_PAGE tpl var used for backward compatability
  [ticket/9341] Add tests for checking Next and Previous template vars
  [ticket/9341] Move create_topic and post into functional test case
  [ticket/9341] Use U_PREVIOUS and U_NEXT in template files
  [ticket/9341] Correctly named template vars
2013-06-29 15:49:23 +02:00
Andreas Fischer
c0c4ce8b8b Merge remote-tracking branch 'dhruvgoel92/ticket/11593' into develop
* dhruvgoel92/ticket/11593:
  [ticket/11593] initialize $is_expr as null before being passed to get_varref
2013-06-29 14:07:42 +02:00
Dhruv
5182ec09a5 [ticket/11593] initialize $is_expr as null before being passed to get_varref
PHPBB3-11593
2013-06-29 15:26:36 +05:30
Joseph Warner
27f0b9ff43 [feature/auth-refactor] Forgot @inheritdoc on methods
PHPBB3-9734
2013-06-28 14:42:26 -04:00
Joseph Warner
24e323d593 [feature/auth-refactor] Finish and clean up documentation
PHPBB3-9734
2013-06-27 14:20:07 -04:00
Dhruv
69001902b9 [ticket/9341] remove PREV_PAGE tpl var used for backward compatability
PHPBB3-9341
2013-06-27 20:47:03 +05:30
Joseph Warner
5af7d2b07f [feature/auth-refactor] Change phpEx to php_ext in new classes
PHPBB3-9734
2013-06-26 21:45:37 -04:00
Joseph Warner
4afdd650cd [feature/auth-refactor] Removed no longer used variable
PHPBB3-9734
2013-06-26 00:02:20 -04:00
Joseph Warner
59929669f5 [feature/auth-refactor] Fix errors in acp_board
Fixes errors introduced by the last several commits.

PHPBB3-9734
2013-06-25 22:27:16 -04:00
Joseph Warner
08614e2b85 [feature/auth-refactor] Fix indentation on acp_board
PHPBB3-9734
2013-06-25 22:26:03 -04:00
Joseph Warner
3c394aee62 [feature/auth-refactor] Refactor auth in acp_board
Changes the acp_board code to directly call the auth providers out
of the $auth_providers variable that is populated by the
phpbb_container.

PHPBB3-9734
2013-06-25 22:21:38 -04:00
Joseph Warner
b78b6711c8 [feature/auth-refactor] Don't truncate name then reattach same thing
PHPBB3-9734
2013-06-25 22:15:21 -04:00
Joseph Warner
09372d765d [feature/auth-refactor] Remove old auth plugins
PHPBB3-9734
2013-06-25 22:01:18 -04:00
Joseph Warner
4f3f0a8791 [feature/auth-refactor] Remove references to old auth plugins
Removes what is hopefully the last references to the old auth
plugins in the code base.

PHPBB3-9734
2013-06-25 21:59:19 -04:00
Dhruv
fdd60548bf [ticket/9341] Use U_PREVIOUS and U_NEXT in template files
PHPBB3-9341
2013-06-22 03:44:22 +05:30
sakimahesh
465b515600 [ticket/9341] Correctly named template vars
PHPBB3-9341
2013-06-22 03:44:17 +05:30
Joseph Warner
b8610c4b98 [feature/auth-refactor] Refactor code to use services
Refactors all loading of auth providers to use services instead of
directly calling the class.

PHPBB3-9734
2013-06-21 18:04:11 -04:00
Joas Schilling
a5c971176b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10776] update min php version 5.3.3 in readme
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.

Conflicts:
	phpBB/docs/README.html
2013-06-21 17:12:58 +02:00
Joas Schilling
4828cb21cf Merge remote-tracking branch 'dhruvgoel92/ticket/10776' into develop-olympus
* dhruvgoel92/ticket/10776:
  [ticket/10776] update min php version 5.3.3 in readme
  [ticket/10776] Fixed a couple language changes in docs/README.html.
  [ticket/10776] Fixed errors in docs/README.html.
2013-06-21 16:32:59 +02:00
Dhruv
6cbb2d6136 [ticket/10776] update min php version 5.3.3 in readme
PHPBB3-10776
2013-06-21 18:24:06 +05:30
Joas Schilling
4ac5028d24 Merge remote-tracking branch 'dhruvgoel92/ticket/11503' into develop
* dhruvgoel92/ticket/11503:
  [ticket/11503] similar implementation for mssql_native and odbc
2013-06-21 13:08:11 +02:00
Joseph Warner
95f38b457e [feature/auth-refactor] Create an auth.provider_collector service
Creates an auth.provider_collector service for all auth providers.

PHPBB3-9734
2013-06-20 22:50:35 -04:00
Joseph Warner
c9062fc1ee [feature/auth-refactor] Convert provider_apache to a service
Removes globals from provider_apache and turns it into a service.

PHPBB3-9734
2013-06-20 22:21:22 -04:00
Joseph Warner
c253189e85 [feature/auth-refactor] Convert provider_ldap to a service
Removes globals from provider_ldap and converts it into a service.

PHPBB3-9734
2013-06-20 22:11:53 -04:00