aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [feature/auth-refactor] Have a base auth classJoseph Warner2013-07-114-83/+75
| | | | PHPBB3-9734
* Merge remote-tracking branch 'remotes/imkingdavid/ticket/11253' into developNathan Guse2013-07-061-0/+51
|\ | | | | | | | | | | | | | | | | | | # 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
| * [ticket/11253] Put AND clause in correct SQL queryDavid King2013-06-231-3/+3
| | | | | | | | PHPBB3-11253
| * [ticket/11253] Fix a few things brought up in the PRDavid King2013-06-231-7/+6
| |
| * [ticket/11253] Fix typo in constantDavid King2013-06-221-1/+1
| | | | | | | | PHPBB3-11253
| * [ticket/11253] Add migration to add auth check to UCP signature moduleDavid King2013-06-221-0/+52
| | | | | | | | PHPBB3-11253
* | Merge branch 'develop-olympus' into developNathan Guse2013-07-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | # 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().
| * | [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.Andreas Fischer2013-07-031-1/+1
| | | | | | | | | | | | PHPBB3-11619
* | | [feature/auth-refactor] Move auth providers to separate directoryJoseph Warner2013-07-045-0/+10
| | | | | | | | | | | | | | | | | | | | | Moves the provider files to their own directory per bantu's suggestion. PHPBB3-9734
* | | Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into developDavid King2013-07-0310-1004/+1150
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | [feature/auth-refactor] Fix code style issueJoseph Warner2013-07-021-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9734
| * | | [feature/auth-refactor] Fix comment grammarJoseph Warner2013-07-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9734
| * | | [feature/auth-refactor] Fix the actual cause of test failuresJoseph Warner2013-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | [feature/auth-refactor] A possible fix for the functional test failuresJoseph Warner2013-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't like this fix as it really shouldn't be needed. But it makes the functional tests pass. PHPBB3-9734
| * | | [feature/auth-refactor] Forgot @inheritdoc on methodsJoseph Warner2013-06-283-0/+54
| | | | | | | | | | | | | | | | PHPBB3-9734
| * | | [feature/auth-refactor] Finish and clean up documentationJoseph Warner2013-06-274-74/+43
| | | | | | | | | | | | | | | | PHPBB3-9734
| * | | [feature/auth-refactor] Change phpEx to php_ext in new classesJoseph Warner2013-06-262-9/+9
| | | | | | | | | | | | | | | | PHPBB3-9734
| * | | [feature/auth-refactor] Removed no longer used variableJoseph Warner2013-06-261-1/+0
| | | | | | | | | | | | | | | | PHPBB3-9734
| * | | [feature/auth-refactor] Fix errors in acp_boardJoseph Warner2013-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes errors introduced by the last several commits. PHPBB3-9734
| * | | [feature/auth-refactor] Fix indentation on acp_boardJoseph Warner2013-06-251-41/+38
| | | | | | | | | | | | | | | | PHPBB3-9734
| * | | [feature/auth-refactor] Refactor auth in acp_boardJoseph Warner2013-06-251-22/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | [feature/auth-refactor] Don't truncate name then reattach same thingJoseph Warner2013-06-251-4/+4
| | | | | | | | | | | | | | | | PHPBB3-9734
| * | | [feature/auth-refactor] Remove old auth pluginsJoseph Warner2013-06-253-886/+0
| | | | | | | | | | | | | | | | PHPBB3-9734
| * | | [feature/auth-refactor] Remove references to old auth pluginsJoseph Warner2013-06-251-29/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes what is hopefully the last references to the old auth plugins in the code base. PHPBB3-9734
| * | | [feature/auth-refactor] Refactor code to use servicesJoseph Warner2013-06-213-40/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactors all loading of auth providers to use services instead of directly calling the class. PHPBB3-9734
| * | | [feature/auth-refactor] Convert provider_apache to a serviceJoseph Warner2013-06-201-40/+49
| | | | | | | | | | | | | | | | | | | | | | | | Removes globals from provider_apache and turns it into a service. PHPBB3-9734
| * | | [feature/auth-refactor] Convert provider_ldap to a serviceJoseph Warner2013-06-201-58/+64
| | | | | | | | | | | | | | | | | | | | | | | | Removes globals from provider_ldap and converts it into a service. PHPBB3-9734
| * | | [feature/auth-refactor] Turn provider_db into a serviceJoseph Warner2013-06-201-41/+57
| | | | | | | | | | | | | | | | | | | | | | | | Removes globals from provider_db and turns it into a service. PHPBB3-9734
| * | | [feature/auth-refactor] Fix LDAP conversion errorJoseph Warner2013-06-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I messed up when converting over auth_ldap this commit fixes that error. I have not been able to extensively test ldap due to not having ldap set up on this computer yet. Apache authentication appears to work. PHPBB3-9734
| * | | [feature/auth-refactor] Finish refactoring auth pluginsJoseph Warner2013-06-195-10/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I believe that this commit should have final minimal changes needed to replace the old auth plugins with the refactored auth plugins. Added a few more elements to the interface based on the old auth plugins. Documentation is not complete and need works on these new elements. PHPBB3-9734
| * | | [feature/auth-refactor] Refactor session for new auth interfaceJoseph Warner2013-06-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Refactors phpbb_session to use the new auth interface. PHPBB3-9734
| * | | [feature/auth-refactor] Refactor acp_board for new auth interfaceJoseph Warner2013-06-195-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially refactors acp_board for the new authentication interface. Leaves some questionable if statements in the file. Modifies the interface to correctly impletment the acp() method. Modifies each provider to comply with the above mentioned interface modification. PHPBB3-9734
| * | | [feature/auth-refactor] Fix typos causing changes to not workJoseph Warner2013-06-195-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces short tags with long tags. Fixes the interface to be an interface and not class in the file. Removes unnecessary include_once from auth.php. PHPBB-9734
| * | | [feature/auth-refactor] Refactor login to use new interfaceJoseph Warner2013-06-181-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Refactors auth.php to use the provider_interface during login. PHPBB-9734
| * | | [feature/auth-refactor] Make DB auth consistent with interfaceJoseph Warner2013-06-181-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes provider_db consistent with provider_interface. Removes $ip, $browser, and $forwarded_for from the arguments of phpbb_auth_provider_db::login() as these are provided by the global variable $user. PHPBB3-9734
| * | | [feature/auth-refactor] Make LDAP consistent with interfaceJoseph Warner2013-06-181-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes the provider_ldap consistent with the provider_interface except for the acp() method which has not yet been finalized. Renames phpbb_auth_provider_ldap::user_filter to phpbb_auth_provider_ldap::ldap_user_filter to maintain the original name of the function from auth_ldap. PHPBB3-9734
| * | | [feature/auth-refactor] Make Apache consistent with interfaceJoseph Warner2013-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes the provider_apache consistent with the provider_interface by removing the pass-by-reference of $username and $password. PHPBB3-9734
| * | | [feature/auth-refactor] Fix comment block indentationJoseph Warner2013-06-183-58/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Comment block indentation was off by one space on the provider_* files due to being incorrectly copied over from the auth_* files. PHPBB3-9734
| * | | [feature/auth-refactor] Document the provider interfaceJoseph Warner2013-06-181-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provides basic documentation of the auth_provideR_interface. Changes the login method to login($username, $password) for consistency with the providers. acp() is not fully documented. It appears that it is meant to return an array of some sort and take in a variable by reference. PHPBB3-9734
| * | | [feature/auth-refactor] LDAP Auth Provider SkeletonJoseph Warner2013-06-171-0/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a ldap auth provider using code taken verbatim from auth_ldap.php. PHPBB3-9734
| * | | [feature/auth-refactor] Database Auth Provider SkeletonJoseph Warner2013-06-171-0/+309
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a skeleton of the database auth provider from auth_db.php. The functions are copied verbatim complete with globals and any existing errors. PHPBB3-9734
| * | | [feature/auth-refactor] Auth Apache Provider SkeletonJoseph Warner2013-06-171-0/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a skeleton for Apache based authentication using the phpbb_auth_provider_interface named phpbb_auth_provider_apache. This brings over all code in auth_apache.php verbatim complete with all global variables currently in use. PHPBB3-9734
| * | | [feature/auth-refactor] Provider Interface SkeletonJoseph Warner2013-06-171-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | Creates a skeleton of the authentication provider interface. PHPBB3-9734
* | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11437' into developJoas Schilling2013-07-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11437: [ticket/11437] avoid $start becoming negative when no search results are found
| * | | | [ticket/11437] avoid $start becoming negative when no search results are foundDhruv2013-06-191-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When search returns no results there is no need to go inside the if statement. Since $result_count becomes zero, $start becomes negative which leads to failed assertion. PHPBB3-11437
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-031-0/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | * develop-olympus: [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php
| * | | [ticket/11617] Remove spaces and tabs from empty linesMatt Friedman2013-07-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11617
| * | | [ticket/11617] Missing U_ACTION in acp_captcha.phpMatt Friedman2013-07-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-11617 PHPBB3-11617
* | | | Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/11566-develop' into ↵Joas Schilling2013-07-021-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ Merge branch 'ticket/11566' into ticket/11566-developDhruv2013-07-011-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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