aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [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 branch 'ticket/10820' into ticket/10820-developDhruv2013-06-141-1/+1
|\ | | | | | | | | | | | | | | * ticket/10820: [ticket/10820] fix if condition to check for IE Conflicts: phpBB/download/file.php
* \ Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-131-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv (13) and riadhchtara (1) * ticket/10820: [ticket/10820] Add additional check for IE in condition [ticket/10820] Fix function docblock [ticket/10820] Inject IE version in function [ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7 [ticket/10820] remove unnecessary parentheses [ticket/10820] fix docblock [ticket/10820] add param and return to function [ticket/10820] simplify regex and escape dot [ticket/10820] Use singular return [ticket/10820] remove unnecessary condition checks [ticket/10820] add function docblock [ticket/10820] fix IE check function [ticket/10820] proper usage of global and local variable browser [ticket/10820] Image downloader recognize new version of ie When a user download image attachement using ie8, the file is displayed. However, when he uses ie version greater than 8, the image is download. A changes are made to phpbb/download/file.php to solve the problem. We check now if the ie version is greater or equal to 8 and not only equal to 8 Conflicts: phpBB/download/file.php
* | Merge branch 'develop' into ticket/10820-developDhruv2013-06-131-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander (10) and Joas Schilling (2) # Via Andreas Fischer (3) and Joas Schilling (1) * develop: [ticket/11605] Remove unused copied_files property [ticket/11605] Use empty_dir to better delete files and dirs of extensions [ticket/11579] Add method for validating emails for valid MX and mark as slow [ticket/11579] Do not extend validate_data_helper [ticket/11579] Add missing commas to validate_username_test [ticket/11579] Rework calls to validate_data_helper [ticket/11579] Move simple tests into seperate files [ticket/11579] Use test case helper class and use assert prefix for method [ticket/11579] Move tests into seperate files depending on needed fixture [ticket/11579] Remove unnecessary globals from validate_password() [ticket/11579] Add remaining unit tests for validate_data functions [ticket/11579] Add basic set of unit tests for validate_data()
| * \ Merge branch 'develop-olympus' into developAndreas Fischer2013-06-111-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11579] Add method for validating emails for valid MX and mark as slow [ticket/11579] Do not extend validate_data_helper [ticket/11579] Add missing commas to validate_username_test [ticket/11579] Rework calls to validate_data_helper [ticket/11579] Move simple tests into seperate files [ticket/11579] Use test case helper class and use assert prefix for method [ticket/11579] Move tests into seperate files depending on needed fixture [ticket/11579] Remove unnecessary globals from validate_password() [ticket/11579] Add remaining unit tests for validate_data functions [ticket/11579] Add basic set of unit tests for validate_data() Conflicts: tests/mock/cache.php
| | * Merge remote-tracking branch 'marc1706/ticket/11579' into develop-olympusAndreas Fischer2013-06-111-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11579: [ticket/11579] Add method for validating emails for valid MX and mark as slow [ticket/11579] Do not extend validate_data_helper [ticket/11579] Add missing commas to validate_username_test [ticket/11579] Rework calls to validate_data_helper [ticket/11579] Move simple tests into seperate files [ticket/11579] Use test case helper class and use assert prefix for method [ticket/11579] Move tests into seperate files depending on needed fixture [ticket/11579] Remove unnecessary globals from validate_password() [ticket/11579] Add remaining unit tests for validate_data functions [ticket/11579] Add basic set of unit tests for validate_data()
| | | * [ticket/11579] Remove unnecessary globals from validate_password()Marc Alexander2013-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The globals $db and $user are not used in that function. PHPBB3-11579
* | | | Merge branch 'develop' into ticket/10820-developDhruv2013-06-1358-487/+3429
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (146) and others # Via Andreas Fischer (50) and others * develop: (356 commits) [ticket/11599] Copy the forums into a static array for later reuse [ticket/11602] Do not call localize_errors() if avatars are disabled [ticket/11601] Add protected method for database sync and call it [ticket/11601] Split post_setup_synchronisation logic from xml parsing [ticket/11550] Specify a valid path so it's clearer that it must be a path [ticket/11550] Move comments to correct function [ticket/11550] We use a different fixture set for extension_acp_test.php [ticket/11550] Fixtures should only be directories not files [ticket/11550] Use new functionality from the test case helpers [ticket/11550] Move functionality for copying/restoring to test case helpers [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php [ticket/11543] Add more users so #hidden <> #normal [ticket/11590] Close database connections when tearDown() is called [ticket/develop/11543] Use plurals in develop [ticket/11543] Use correct IP addresses and inject time for correct values [ticket/11543] Add unit tests for obtain_users_online_string() [ticket/11543] Add unit tests for obtain_users_online() with empty forum [ticket/11543] Add unit tests for obtain_users_online() [ticket/11543] Add unit tests for obtain_guest_count() [ticket/11481] Move prepended slash from calls into function ...
| * | | [ticket/11602] Do not call localize_errors() if avatars are disabledMarc Alexander2013-06-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The avatar manager's method localize_errors() shouldn't be called if avatars are disabled in the config. PHPBB3-11602
| * | | Merge remote-tracking branch 'remotes/nickv/ticket/11481' into developNathan Guse2013-06-0712-0/+1434
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11481: [ticket/11481] Move prepended slash from calls into function [ticket/11481] Remove globals and use dependency injection instead [ticket/11481] Use container for all classes and inject dependencies [ticket/11481] Move functions from feed into helper class [ticket/11481] Move active topics feed to own file [ticket/11481] Move topics feed to own file [ticket/11481] Move news feed to own file [ticket/11481] Move forums feed to own file [ticket/11481] Move topic feed to own file [ticket/11481] Move forum feed to own file [ticket/11481] Move overall feed to own file [ticket/11481] Move feed topic base to own file [ticket/11481] Move feed post base to own file [ticket/11481] Move feed base to own file [ticket/11481] Move feed factory to own file
| | * | | [ticket/11481] Move prepended slash from calls into functionJoas Schilling2013-06-065-5/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Remove globals and use dependency injection insteadJoas Schilling2013-06-0611-125/+115
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Use container for all classes and inject dependenciesJoas Schilling2013-06-067-33/+81
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move functions from feed into helper classJoas Schilling2013-06-061-0/+159
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move active topics feed to own fileJoas Schilling2013-06-061-0/+139
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move topics feed to own fileJoas Schilling2013-06-061-0/+93
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move news feed to own fileJoas Schilling2013-06-061-0/+115
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move forums feed to own fileJoas Schilling2013-06-061-0/+78
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move topic feed to own fileJoas Schilling2013-06-061-0/+114
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move forum feed to own fileJoas Schilling2013-06-061-0/+145
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move overall feed to own fileJoas Schilling2013-06-061-0/+99
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move feed topic base to own fileJoas Schilling2013-06-061-0/+61
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move feed post base to own fileJoas Schilling2013-06-061-0/+59
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move feed base to own fileJoas Schilling2013-06-061-0/+230
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| | * | | [ticket/11481] Move feed factory to own fileJoas Schilling2013-06-061-0/+104
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | Merge remote-tracking branch 'remotes/Marc/ticket/11587' into developNathaniel Guse2013-06-061-4/+13
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/Marc/ticket/11587: [ticket/11587] Add functional tests for group teampage settings [ticket/11587] Pass legend and teampage settings to group_create()
| | * | | [ticket/11587] Pass legend and teampage settings to group_create()Marc Alexander2013-06-041-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without passing those values, the group is removed from the teampage and the legend while submitting the edit form on the ucp groups manage page. PHPBB3-11587
| * | | | Merge branch 'develop-olympus' into developDhruv2013-06-051-2/+9
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Dhruv (1) * develop-olympus: [ticket/11583] Use a new lang key instead of giving the old one a new meaning. [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher. Conflicts: phpBB/includes/search/fulltext_mysql.php phpBB/language/en/acp/search.php
| | * | Merge remote-tracking branch 'bantu/ticket/11583' into develop-olympusDhruv2013-06-051-2/+9
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11583: [ticket/11583] Use a new lang key instead of giving the old one a new meaning. [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
| | | * | [ticket/11583] Use a new lang key instead of giving the old one a new meaning.Andreas Fischer2013-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11583
| | | * | [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.Andreas Fischer2013-06-011-1/+8
| | | |/ | | | | | | | | | | | | PHPBB3-11583
| * | | [ticket/11586] Move $filedata['thumbnail'] to where it might be returned.Andreas Fischer2013-06-031-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11586
| * | | [ticket/11586] Combine $filedata['post_attach'] assign into a single statement.Andreas Fischer2013-06-031-8/+1
| | | | | | | | | | | | | | | | PHPBB3-11586