aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
| * | | [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.Andreas Fischer2013-06-031-8/+8
| | | | | | | | | | | | | | | | PHPBB3-11586
| * | | [ticket/11586] Combine administrator/moderator checks together.Andreas Fischer2013-06-031-7/+7
| | | | | | | | | | | | | | | | PHPBB3-11586
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-10/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/11145] Wrong error thrown when uploading a bigger image.
| | * | Merge remote-tracking branch 'erangamapa/ticket/11145' into develop-olympusAndreas Fischer2013-06-031-10/+10
| | |\ \ | | | | | | | | | | | | | | | | | | | | * erangamapa/ticket/11145: [ticket/11145] Wrong error thrown when uploading a bigger image.
| | | * | [ticket/11145] Wrong error thrown when uploading a bigger image.erangamapa2013-05-251-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When attaching an image to a post with a size larger than maximum defined in php.ini, 'ATTACHED_IMAGE_NOT_IMAGE' error is thrown. $file->is_image() is returning false value when image size is too large. Therefore, moved not image test down after image size test. PHPBB3-11145
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-0/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10840] Add check_form_key to acp_groups.php
| | * | | [ticket/10840] Add check_form_key to acp_groups.phpJoas Schilling2013-06-031-0/+10
| | | |/ | | |/| | | | | | | | | PHPBB3-10840
| * | | Merge remote-tracking branch 'Elsensee/ticket/11409' into developJoas Schilling2013-05-311-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/11409: [ticket/11409] Add success message after updating group position settings
| | * | | [ticket/11409] Add success message after updating group position settingsOliver Schramm2013-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11409
| * | | | Merge remote-tracking branch 'EXreaction/ticket/11387' into developJoas Schilling2013-05-311-3/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * EXreaction/ticket/11387: [ticket/11387] Log module added only after it has been added
| | * | | [ticket/11387] Log module added only after it has been addedNathaniel Guse2013-03-021-3/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11387
| * | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * develop-olympus: [ticket/11578] Add missing underscore after 'validate' function prefix
| | * | | [ticket/11578] Add missing underscore after 'validate' function prefixmarc17062013-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The underscore after the 'validate' function prefix for the older functions was dropped by accident in PR #1407. This patch will add it back. PHPBB3-11578
| * | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11538] Cut functional tests down a bit as these are more expensive. [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass. [ticket/11538] Add unit tests for phpbb_validate_hex_colour().
| | * | | [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.Andreas Fischer2013-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11538
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-263-19/+48
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11538] Add optional switch as argument to hex colour validation [ticket/11538] Modify test colour values [ticket/11538] Limit comment in acp_groups to 80 characters per line [ticket/11538] Move group ID into abstract test class and add more test cases [ticket/11538] Merge calls to validate_data() in acp_groups [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour [ticket/11538] Use abstract class for functional test cases for group colour [ticket/11538] Add function phpbb_validate_colour for validating colours [ticket/11538] Make sure regex doesn't allow multiple color values [ticket/11538] Add tests for acp group manage page [ticket/11538] Simplify colour value check and remove support for '#' [ticket/11538] Fix incorrect regex and test for duplicate # in color string [ticket/11538] Use regex for testing color value and improve tests [ticket/11538] Make sure group color can't exceed maximum of 6 characters Conflicts: phpBB/includes/functions_user.php phpBB/styles/prosilver/template/ucp_groups_manage.html
| | * | | Merge remote-tracking branch 'marc1706/ticket/11538' into develop-olympusAndreas Fischer2013-05-263-6/+46
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11538: [ticket/11538] Add optional switch as argument to hex colour validation [ticket/11538] Modify test colour values [ticket/11538] Limit comment in acp_groups to 80 characters per line [ticket/11538] Move group ID into abstract test class and add more test cases [ticket/11538] Merge calls to validate_data() in acp_groups [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour [ticket/11538] Use abstract class for functional test cases for group colour [ticket/11538] Add function phpbb_validate_colour for validating colours [ticket/11538] Make sure regex doesn't allow multiple color values [ticket/11538] Add tests for acp group manage page [ticket/11538] Simplify colour value check and remove support for '#' [ticket/11538] Fix incorrect regex and test for duplicate # in color string [ticket/11538] Use regex for testing color value and improve tests [ticket/11538] Make sure group color can't exceed maximum of 6 characters
| | | * | | [ticket/11538] Add optional switch as argument to hex colour validationMarc Alexander2013-05-193-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value of $optional will decide whether an empty string will be treated as incorrect input or if it is allowed. The optional argument will default to false and therefore treat an empty string as incorrect unless explicitly told to not do so. PHPBB3-11538
| | | * | | [ticket/11538] Limit comment in acp_groups to 80 characters per lineMarc Alexander2013-05-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11538
| | | * | | [ticket/11538] Merge calls to validate_data() in acp_groupsMarc Alexander2013-05-191-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11538
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 07:59:09 +0000