aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developNils Adermann2014-06-234-0/+983
|\ | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12612] Move functions from mcp.php to functions_mcp.php [ticket/12612] Move function from ucp.php to functions_user.php [ticket/12612] Move functions from memberlist.php to functions_display.php [ticket/12612] Move functions from posting.php to functions_posting.php
| * Merge remote-tracking branch 'github-nickvergessen/ticket/12612-ascraeus' ↵Nils Adermann2014-06-234-0/+983
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop-ascraeus * github-nickvergessen/ticket/12612-ascraeus: [ticket/12612] Move functions from mcp.php to functions_mcp.php [ticket/12612] Move function from ucp.php to functions_user.php [ticket/12612] Move functions from memberlist.php to functions_display.php [ticket/12612] Move functions from posting.php to functions_posting.php
| | * [ticket/12612] Move functions from mcp.php to functions_mcp.phpJoas Schilling2014-06-181-0/+666
| | | | | | | | | | | | PHPBB3-12612
| | * [ticket/12612] Move function from ucp.php to functions_user.phpJoas Schilling2014-06-181-0/+20
| | | | | | | | | | | | PHPBB3-12612
| | * [ticket/12612] Move functions from memberlist.php to functions_display.phpJoas Schilling2014-06-181-0/+163
| | | | | | | | | | | | PHPBB3-12612
| | * [ticket/12612] Move functions from posting.php to functions_posting.phpJoas Schilling2014-06-181-0/+134
| | | | | | | | | | | | PHPBB3-12612
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-231-0/+0
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/12761] Remove the execute bit from functions_user.php
| * | [ticket/12761] Remove the execute bit from functions_user.phpn-aleha2014-06-231-0/+0
| | | | | | | | | | | | PHPBB3-12761
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-229-367/+0
|\ \ \ | |/ / | | | | | | | | | | | | * develop-ascraeus: [ticket/12747] Remove some methods which are not used anymore [ticket/12747] Drop support for Firebird
| * | Merge pull request #2629 from nickvergessen/ticket/12747Andreas Fischer2014-06-229-367/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12747] Drop support for Firebird * nickvergessen/ticket/12747: [ticket/12747] Remove some methods which are not used anymore [ticket/12747] Drop support for Firebird Conflicts: phpBB/phpbb/db/driver/firebird.php
| | * | [ticket/12747] Drop support for FirebirdJoas Schilling2014-06-209-367/+0
| | | | | | | | | | | | | | | | PHPBB3-12747
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-221-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/12704] Improve the load time information in the footer when enabled
| * | | Merge pull request #2591 from rxu/ticket/12704Joas Schilling2014-06-221-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12704] Improve the load time information in the footer when enabled * rxu/ticket/12704: [ticket/12704] Improve the load time information in the footer when enabled
| | * | | [ticket/12704] Improve the load time information in the footer when enabledrxu2014-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #2570 has added new constant to display load time information without debug mode is being on (https://tracker.phpbb.com/browse/PHPBB3-12687). This patch expands the total load time info with SQL/PHP load times, while hiding the additional info with <abbr> element. PHPBB3-12704
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-221-1/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12691] Comment change [ticket/12691] Change event to core.delete_pm_before [ticket/12691] Add core.delete_pm to funtion delete_pm
| * | | | Merge pull request #2575 from lucifer4o/ticket/12691Joas Schilling2014-06-221-1/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12691] Add core.delete_pm to funtion delete_pm * lucifer4o/ticket/12691: [ticket/12691] Comment change [ticket/12691] Change event to core.delete_pm_before [ticket/12691] Add core.delete_pm to funtion delete_pm
| | * | | | [ticket/12691] Comment changeStanislav Atanasov2014-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change a bit the core event comment PHPBB3-12691
| | * | | | [ticket/12691] Change event to core.delete_pm_beforeStanislav Atanasov2014-06-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just a requested change by nickvergessen PHPBB3-12691
| | * | | | [ticket/12691] Add core.delete_pm to funtion delete_pmStanislav Atanasov2014-06-221-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.delete_pm to funtion delete_pm. Event will return: int $user_id - ID of the user requested the message delete array $msg_ids - array of all messages to be deleted int $folder_id - ID of the user folder where the messages are stored Justification: Allow extensions to capture this event and act as intended by ext author PHPBB3-12691
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-221-1/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12701] Add change [ticket/12701] Rmove before event and expand modify_data [ticket/12701] Add events to user_add function
| * | | | | Merge pull request #2586 from lucifer4o/ticket/12701Joas Schilling2014-06-221-1/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Ticket/12701] Add events to user_add function * lucifer4o/ticket/12701: [ticket/12701] Add change [ticket/12701] Rmove before event and expand modify_data [ticket/12701] Add events to user_add function
| | * | | | | [ticket/12701] Add changeStanislav Atanasov2014-06-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change back to since Add change PHPBB3-12701
| | * | | | | [ticket/12701] Rmove before event and expand modify_dataStanislav Atanasov2014-06-221-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing core.user_add_before Adding $user_row and $cp_data to core.user_add_modify_data PHPBB3-12701
| | * | | | | [ticket/12701] Add events to user_add functionStanislav Atanasov2014-06-221-0/+23
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add two new events to user_add function in ./includes/functions_user.php. core.user_add_before - allow modification of submitted to function data. Returns: @var array $user_row - user_row array - User array @var array $cp_data - cp_data array - CPF array core.user_add_after - return user_id, user_row and cp_data after user registration Returns: @var int $user_id - user_id of the new user @var array $user_row - user_row array - User array @var array $cp_data - cp_data array - CPF array Justification: Allow extensions to parse data before and after creation of the user. PHPBB3-12701
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-221-0/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12646] Changed to navlinks.MICRODATA [ticket/12646] Add check for navlinks.FORUM_ID [ticket/12646] Changed index/home data attr & updated subsilver [ticket/12646] Add data-f attribute to breadcrumb links
| * | | | | Merge pull request #2530 from PayBas/ticket/12646Joas Schilling2014-06-221-0/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12646] Add data-# attribute to breadcrumb links * PayBas/ticket/12646: [ticket/12646] Changed to navlinks.MICRODATA [ticket/12646] Add check for navlinks.FORUM_ID [ticket/12646] Changed index/home data attr & updated subsilver [ticket/12646] Add data-f attribute to breadcrumb links
| | * | | | [ticket/12646] Changed to navlinks.MICRODATAPayBas2014-06-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12646
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-222-6/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12723] Do not mention too many details on documentation. [ticket/12723] Do not reference the coding guidelines section. [ticket/12757] Add a Code Sniffer ruleset for PHP files of phpBB extensions [ticket/12723] Properly describe new Code Sniffer rulsets. [ticket/12723] Use core suffix in filename instead of phpbb in the middle. [ticket/12723] Add Sniff ensuring PHP files use the correct file header
| * | | | | [ticket/12723] Add Sniff ensuring PHP files use the correct file headerTristan Darricau2014-06-222-6/+15
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-12723
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-201-0/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/11711] Improve coding and comments of character check [ticket/11711] Reduce size of tests and also test topic titles [ticket/11711] Improve checks for unsupported characters and check subject [ticket/11711] Inform user of unsupported characters while posting
| * | | | Merge pull request #2566 from marc1706/ticket/11711Joas Schilling2014-06-201-0/+9
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11711] Inform user of unsupported characters while posting * marc1706/ticket/11711: [ticket/11711] Improve coding and comments of character check [ticket/11711] Reduce size of tests and also test topic titles [ticket/11711] Improve checks for unsupported characters and check subject [ticket/11711] Inform user of unsupported characters while posting
| | * | | [ticket/11711] Improve coding and comments of character checkMarc Alexander2014-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11711
| | * | | [ticket/11711] Improve checks for unsupported characters and check subjectMarc Alexander2014-06-091-7/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11711
| | * | | [ticket/11711] Inform user of unsupported characters while postingMarc Alexander2014-06-091-0/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-11711
* | | | | Merge branch 'develop-ascraeus' into developDhruv2014-06-171-7/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Dhruv Goel (1) and Joas Schilling (1) * develop-ascraeus: [ticket/12705] Store the regular expression matches based on server_url [ticket/12705] Break calling make_clickable with a different server_url
| * | | | Merge pull request #2588 from nickvergessen/ticket/12705Dhruv Goel2014-06-171-7/+10
| |\ \ \ \ | | | | | | | | | | | | Ticket/12705 Fix make_clickable when called with different server_urls
| | * | | | [ticket/12705] Store the regular expression matches based on server_urlJoas Schilling2014-06-141-7/+10
| | | |_|/ | | |/| | | | | | | | | | | | PHPBB3-12705
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-174-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12721] Update rules descriptions [ticket/12721] Add Generic.NamingConventions.ConstructorName in strict [ticket/12721] Add Squiz.Functions.LowercaseFunctionKeywords in legacy [ticket/12721] Add Squiz.ControlStructures.ForLoopDeclaration in legacy [ticket/12721] Add Squiz.ControlStructures.ForEachLoopDeclaration [ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy [ticket/12721] Add Generic.Functions.OpeningFunctionBraceBsdAllman [ticket/12721] Add Squiz.Arrays.ArrayBracketSpacing in the legacy ruleset [ticket/12721] Add Generic.Files.LowercasedFilename in the legacy ruleset
| * | | | [ticket/12721] Update rules descriptionsTristan Darricau2014-06-161-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12721
| * | | | [ticket/12721] Add Squiz.ControlStructures.ForLoopDeclaration in legacyTristan Darricau2014-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12721
| * | | | [ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacyTristan Darricau2014-06-163-3/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12721
| * | | | [ticket/12721] Add Squiz.Arrays.ArrayBracketSpacing in the legacy rulesetTristan Darricau2014-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12721
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-166-19/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset
| * | | | [ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy rulesetTristan Darricau2014-06-166-19/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-12722
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-162-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12724] Add Squiz.PHP.Eval in the legacy ruleset
| * | | | [ticket/12724] Add Squiz.PHP.Eval in the legacy rulesetTristan Darricau2014-06-162-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12724
* | | | | Merge branch 'develop-ascraeus' into developDhruv2014-06-151-8/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Tristan Darricau # Via Dhruv Goel (1) and Tristan Darricau (1) * develop-ascraeus: [ticket/12109] Fix coding style [ticket/12109] Bug when setting permissions with "Select all users"
| * | | | Merge pull request #2431 from Nicofuma/ticket/12109Dhruv Goel2014-06-151-8/+16
| |\ \ \ \ | | | | | | | | | | | | [ticket/12109] Bug when setting permissions with "Select all users"
| | * | | | [ticket/12109] Fix coding styleTristan Darricau2014-05-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12109
| | * | | | [ticket/12109] Bug when setting permissions with "Select all users"Tristan Darricau2014-05-101-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12109 PHPBB3-12109