aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL partsJoas Schilling2013-06-031-0/+4
| | | | | | | | | | | | | | | | PHPBB3-8319
| | * | [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuseJoas Schilling2013-06-031-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The description says: "The URL must be relative to the topic page and cannot contain a server name or protocol." We now enforce this and will add a new token with the current behaviour back. PHPBB3-8319
* | | | Merge remote-tracking branch 'phpbb/develop' into ↵Joas Schilling2013-07-1112-305/+286
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * phpbb/develop: (704 commits) [ticket/11630] Improvements to the PHP lint pre-commit hook [feature/auth-refactor] Move auth providers to separate directory [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file(). [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [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/11585] Make $auth_admin class property [feature/auth-refactor] A possible fix for the functional test failures [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 ... Conflicts: phpBB/docs/sphinx.sample.conf phpBB/feed.php phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
| * | | Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into developDavid King2013-07-031-87/+40
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] 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 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-211-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactors all loading of auth providers to use services instead of directly calling the class. PHPBB3-9734
| | * | | [feature/auth-refactor] Refactor acp_board for new auth interfaceJoseph Warner2013-06-191-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | 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
| * | | | [ticket/11585] Make $auth_admin class propertyDhruv2013-07-021-13/+12
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | $auth_admin is class property and used via $this reference in all methods PHPBB3-11585
| * | | [ticket/11602] Do not call localize_errors() if avatars are disabledMarc Alexander2013-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The avatar manager's method localize_errors() shouldn't be called if avatars are disabled in the config. PHPBB3-11602
| * | | 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
| * | [ticket/11409] Add success message after updating group position settingsOliver Schramm2013-05-311-0/+2
| | | | | | | | | | | | PHPBB3-11409
| * | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-261-5/+13
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-261-5/+13
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colourMarc Alexander2013-05-191-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11538
| | | * [ticket/11538] Add function phpbb_validate_colour for validating coloursMarc Alexander2013-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will be possible to use this function via the validate_data() function interface that has already been used previously. Thus, this new function will extend the capabilities of validate_data() to checking hex color values. PHPBB3-11538
| | | * [ticket/11538] Make sure regex doesn't allow multiple color valuesMarc Alexander2013-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will now make sure that 'AAFF00' will be matched but strings like 'AAFF00 AABB00' will not. PHPBB3-11538
| | | * [ticket/11538] Simplify colour value check and remove support for '#'Marc Alexander2013-05-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The input length for the hex color is now limited to 6 characters and the support for colors starting with a '#' has been dropped. The allowed input length of 7 in prosilver seems to have been a relict from old ages of phpBB3. In order to have proper support for correct checking of the colour value, the new code was also ported to the ACP groups manage page. The tests have been modified to reflect the changes to the behavior of the color check. Tests for the ACP will follow. PHPBB3-11538
| * | | Merge remote-tracking branch 'remotes/Senky/ticket/11010' into developNathaniel Guse2013-05-212-63/+64
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Senky (19) and others # Via Senky * remotes/Senky/ticket/11010: (32 commits) [ticket/11010] properly tabifying 'max_autologin_time' [ticket/11010] resolving latest comments [ticket/11010] Fixes for number input in acp [ticket/11010] Fix input type for urls [ticket/11010] Fix email inputs [ticket/11010] updating tests [ticket/11010] dealing with dimensions problem, removing extra code [ticket/11010] Change input type to search for search forms [ticket/11010] Add all HTML5 input types to ACP [ticket/11010] Add HTML5 input types to installer [ticket/11010] validation to match type [ticket/11010] displaying min and max only if they are set [ticket/11010] fixing tests [ticket/11010] replacing maxlenght with max [ticket/11010] applying some of EXreaction notes [ticket/11010] Try to keep min < max. [ticket/11010] Mock user in order for the test to run standalone. [ticket/11010] Progress toward fixing the test suite. [ticket/11010] adding type="url" to 'site_home_url' [ticket/11010] fixing inputs types in memberlist_search.html ...
| | * | | [ticket/11010] properly tabifying 'max_autologin_time'Senky2013-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| | * | | [ticket/11010] resolving latest commentsSenky2013-05-211-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| | * | | [ticket/11010] Fixes for number input in acpVjacheslav Trushkin2013-05-201-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| | * | | [ticket/11010] validation to match typeSenky2013-05-202-48/+48
| | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| | * | | [ticket/11010] replacing maxlenght with maxSenky2013-05-202-51/+51
| | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| | * | | [ticket/11010] applying some of EXreaction notesSenky2013-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| | * | | [ticket/11010] adding type="url" to 'site_home_url'Senky2013-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| | * | | [ticket/11010] adding type="number" in ACP; adding type="email" in installSenky2013-05-202-56/+56
| | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| | * | | [ticket/11010] changing email and url input types in php filesSenky2013-05-202-5/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11010
| * | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-05-201-1/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | # By David King # Via David King (1) and Nathan Guse (1) * remotes/upstream/develop-olympus: [ticket/11551] Fix error in system tab if get_remote_file returns empty string
| | * | [ticket/11551] Fix error in system tab if get_remote_file returns empty stringDavid King2013-05-201-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | Currently a debug error is thrown. With this patch, it fails without keeping the admin from being able to access the rest of the System modules by showing a nicer error "Failed to obtain latest version information." PHPBB3-11551
| * | Merge remote-tracking branch 'marc1706/ticket/11535' into developAndreas Fischer2013-05-191-2/+8
| |\ \ | | | | | | | | | | | | | | | | * marc1706/ticket/11535: [ticket/11535] Correctly merge avatar_errors array into primary error array
| | * | [ticket/11535] Correctly merge avatar_errors array into primary error arrayMarc Alexander2013-05-131-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $avatar_errors array needs to be merged into the primary $error array before the group settings get applied. This is currently not the case. Functional tests for this will be provided by PR #1401. PHPBB3-11535
| * | | Merge remote-tracking branch 'EXreaction/ticket/11415' into developDavid King2013-05-181-9/+25
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11415: [ticket/11415] Add test for find_from_extension() [ticket/11415] Send the extension base the finder rather than the manager [ticket/11415] Create function in finder find_from_extension [ticket/11415] Fix ext.manager constructor in tests [ticket/11415] Make migrator/ext.manager dependencies of the base ext class [ticket/11415] Remove migrator dependency from extension manager [ticket/11415] Move migrator to base extension class from ext.manager [ticket/11415] Move while loop from ext manager to acp_extensions.php
| | * | [ticket/11415] Move while loop from ext manager to acp_extensions.phpNathaniel Guse2013-05-011-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now enable_step works as it's supposed to (do one step at a time) and less refreshes are required for the user. PHPBB3-11415
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465Marc Alexander2013-05-126-72/+68
| |\ \ \
| | * \ \ Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into developOleg Pudeyev2013-05-081-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv # Via Dhruv * dhruvgoel92/ticket/10325: [ticket/10325] move migration into a new file [ticket/10325] fix acp language [ticket/10325] use assert_response_success parts [ticket/10325] fix language in acp and ucp [ticket/10325] add assert_response_success in test [ticket/10325] functional tests for forgot password functionality [ticket/10325] add logout function in functional_test_case [ticket/10325] fix language in acp and ucp [ticket/10325] improve acp option language [ticket/10325] fix language key [ticket/10325] fix language variable [ticket/10325] change language var [ticket/10325] fix language [ticket/10325] add new config value to database [ticket/10325] trigger error if forgot password option disabled [ticket/10325] add allow forgot password option in acp
| | | * | | [ticket/10325] change language varDhruv2013-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10325
| | | * | | [ticket/10325] add allow forgot password option in acpDhruv2013-04-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10325