aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-06-241-2/+29
|\ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12755] Apply de morgan to conditional [ticket/12755] Terminate upload loop if upload reaches filesize [ticket/12755] Change upload in remote_upload() method to fit get_remote_file [ticket/12755] Add language string for timed out remote upload [ticket/12755] Add timeout to remote upload to prevent infinite loop
| * [ticket/12755] Apply de morgan to conditionalMarc Alexander2014-06-241-1/+1
| | | | | | | | PHPBB3-12755
| * [ticket/12755] Terminate upload loop if upload reaches filesizeMarc Alexander2014-06-241-2/+12
| | | | | | | | | | | | | | Terminate the upload loop if the expected filesize has been reached instead of trying to read more bytes until the timeout has been reached. PHPBB3-12755
| * [ticket/12755] Change upload in remote_upload() method to fit get_remote_fileMarc Alexander2014-06-241-12/+14
| | | | | | | | PHPBB3-12755
| * [ticket/12755] Add language string for timed out remote uploadMarc Alexander2014-06-231-1/+1
| | | | | | | | PHPBB3-12755
| * [ticket/12755] Add timeout to remote upload to prevent infinite loopMarc Alexander2014-06-211-0/+15
| | | | | | | | PHPBB3-12755
* | [ticket/12612] Prefix check_ids() with phpbb_Joas Schilling2014-06-236-17/+17
| | | | | | | | PHPBB3-12612
* | [ticket/12612] Prefix mcp_sorting() with phpbb_Joas Schilling2014-06-236-7/+7
| | | | | | | | PHPBB3-12612
* | [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused globalJoas Schilling2014-06-239-38/+38
| | | | | | | | PHPBB3-12612
* | [ticket/12612] Prefix module url functions with phpbb_Joas Schilling2014-06-234-27/+31
| | | | | | | | PHPBB3-12612
* | [ticket/12612] Prefix upload_popup() with phpbb_Joas Schilling2014-06-231-1/+1
| | | | | | | | PHPBB3-12612
* | [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused globalJoas Schilling2014-06-231-2/+2
| | | | | | | | PHPBB3-12612
* | [ticket/12612] Prefix custom UCP module function with phpbb_Joas Schilling2014-06-232-2/+10
| | | | | | | | PHPBB3-12612
* | [ticket/12612] Prefix _sort_last_active() with phpbb_Joas Schilling2014-06-231-1/+1
| | | | | | | | PHPBB3-12612
* | [ticket/12612] Prefix show_profile() with phpbb and delete unused globalJoas Schilling2014-06-231-2/+2
| | | | | | | | PHPBB3-12612
* | Merge pull request #2574 from lucifer4o/ticket/12690Joas Schilling2014-06-231-0/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12690] Add core.submit_pm_after event * lucifer4o/ticket/12690: [ticket/12690] Find a space [ticket/12690] Remove $msg_id and chmod [ticket/12690] Add other info to core.submit_pm_after [ticket/12690] Add core.submit_pm_after event
| * | [ticket/12690] Find a spaceStanislav Atanasov2014-06-221-1/+1
| | | | | | | | | | | | | | | | | | Lost a spce there ... found it ... PHPBB3-12690
| * | [ticket/12690] Remove $msg_id and chmodStanislav Atanasov2014-06-221-3/+1
| | | | | | | | | | | | | | | | | | | | | Remove inneded $msg_id Chmod file to 644 PHPBB3-12690
| * | [ticket/12690] Add other info to core.submit_pm_afterStanislav Atanasov2014-06-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added $mode Added $subject Added $data Added $pm_data PHPBB3-12690
| * | [ticket/12690] Add core.submit_pm_after eventStanislav Atanasov2014-06-221-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.submit_pm_after to funtion submit_pm. Event will return just submited msg_id. It should be plased just before return $data['msg_id']; Justification: Using only core.submit_pm_before does not allow to follow up after message submission. The message ID is recieved at DB submission. Some times we need the MSG_ID as identifier PHPBB3-12690
* | | Merge pull request #2571 from Crizz0/ticket/12563Dhruv Goel2014-06-231-2/+2
|\ \ \ | | | | | | | | [ticket/12563] Changes 2 style specific language variables for better understanding
| * | | [ticket/12563] Adds « and » to the links in acp_styles.phpCrizzo2014-06-221-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12563
| * | | [ticket/12563] Removes strintf in acp_styles.php and shorts up <a>Crizzo2014-06-121-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12563
| * | | [ticket/12563] Changes 2 language variables to better understandable namesCrizzo2014-06-101-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12563
* | | | 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
* | | | | [ticket/12761] Remove the execute bit from functions_user.phpn-aleha2014-06-231-0/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12761
* | | | | 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 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 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 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 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
* | | | | | | [ticket/12723] Add Sniff ensuring PHP files use the correct file headerTristan Darricau2014-06-222-6/+15
| |_|/ / / / |/| | | | | | | | | | | | | | | | | PHPBB3-12723
* | | | | | 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 pull request #2588 from nickvergessen/ticket/12705Dhruv Goel2014-06-171-7/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ticket/12705 Fix make_clickable when called with different server_urls