aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_privmsgs.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-161-8/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * [ticket/11640] removed the space that I wonder what it was doing there.Bruno Ais2013-07-291-1/+1
| | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11640
| * [ticket/11640] removed the unsetBruno Ais2013-07-221-1/+0
| | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11640
| * [ticket/11640] generate_text_for_display on functions_privmsgs.phpBruno Ais2013-07-161-8/+6
| | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11640
* | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-161-1/+1
|/ | | | PHPBB3-11700
* [ticket/11103] Instantiate $phpbb_notifications as neededNathan Guse2012-12-131-7/+12
| | | | | | https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976 PHPBB3-11103
* [ticket/11103] Create user loader class, update for DICNathan Guse2012-11-201-7/+7
| | | | | | | | | | | | | Create a very basic user loader class to handle querying/storing user data in a centralized location. Use DIC collection service for notification types/methods. Cleanup unused dependencies. Fix some other issues. PHPBB3-11103
* [ticket/11103] Fix failed automergeNathaniel Guse2012-11-101-1/+1
| | | | PHPBB3-11103
* Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-101-10/+27
|\ | | | | | | | | | | | | | | Conflicts: phpBB/install/schemas/mssql_schema.sql phpBB/report.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * Merge remote-tracking branch 'upstream/develop' into feature/prune-usersOleg Pudeyev2012-11-061-59/+309
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (2171 commits) [ticket/11164] Update composer.phar [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks. [ticket/10933] Dependency inject template context. [ticket/10933] Expanded prose documentation for phpbb_extension_provider. [ticket/10933] Specify empty template path for absolute includephp test. [ticket/10933] Useful documentation for template locate function [ticket/10933] Typo fixes [ticket/10933] Initialize template context when template is constructed. [ticket/11099] Mark acp_ban::display_ban_options() as static. [ticket/11158] Require acl_u_sig for ucp signature module. [ticket/11158] Revert old fix in PHPBB3-10186. [ticket/11159] static public is the currently approved order. [ticket/11157] static public is the currently approved order. [ticket/11157] Fix remaining captcha spam. [ticket/11157] get_captcha_types is an instance method. [ticket/11156] Delete "Misc" tab of forum based permissions + move items [ticket/10848] Move include up. [ticket/11014] Fix old pagination assignment [ticket/11018] Fix several paginations in ACP [ticket/11014] Fix IF statements for new template pagination ... Conflicts: phpBB/includes/functions_user.php
* | | [ticket/11103] Use the full class name as the item_type/methodNathan Guse2012-10-201-7/+7
| | | | | | | | | | | | | | | | | | This is going to require you recreate the db tables. PHPBB3-11103
* | | [ticket/11103] Remove unnecessary commentsNathan Guse2012-10-181-5/+0
| | | | | | | | | | | | | | | | | | | | | Comments that are not needed because the actions are completely self-explanatory PHPBB3-11103
* | | [ticket/11103] Make $phpbb_notifications a global and use it everywhereNathan Guse2012-10-041-21/+14
| | | | | | | | | | | | | | | | | | Do not use phpbb_container everywhere (makes testing difficult) PHPBB3-11103
* | | [ticket/11103] Normalization of $phpbb_notifications variable nameNathan Guse2012-09-141-2/+2
| | | | | | | | | | | | | | | | | | | | | Use $phpbb_notifications instead of $notifications everywhere for consistency and conflict prevention. PHPBB3-11103
* | | [ticket/11103] Delete notifications for PMs deleted by phpbb_delete_user_pmsNathan Guse2012-09-141-0/+13
| | | | | | | | | | | | PHPBB3-11103
* | | [ticket/11103] Mark Private Messages as readNathan Guse2012-09-141-1/+5
| | | | | | | | | | | | PHPBB3-11103
* | | [ticket/11103] The service now handles all user loading itselfNathan Guse2012-09-091-91/+15
| | | | | | | | | | | | | | | | | | Delete pm notifications when pms are deleted PHPBB3-11103
* | | [ticket/11103] Some fixes for the email methodNathan Guse2012-09-081-14/+11
| | | | | | | | | | | | PHPBB3-11103
* | | [ticket/11103] Work on the pm type and email methodNathan Guse2012-09-081-0/+13
| |/ |/| | | | | PHPBB3-11103
* | Merge pull request #914 from EXreaction/ticket/10990Nils Adermann2012-07-221-1/+1
|\ \ | | | | | | Ticket/10990
| * | [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriateNathan2012-07-221-1/+1
| | | | | | | | | | | | PHPBB3-10990
* | | Merge branch 'develop-olympus' into developNils Adermann2012-07-211-83/+122
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10950] Fix grammar in comments [ticket/10950] Delete PMs for users that have not yet read the pm [ticket/10950] Fix unit tests to fit the new pm deleting behaviour [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user [ticket/10950] Remove deleted entries in tests instead of commenting them out [ticket/10950] Use database count() and group by instead of doing that in php [ticket/10950] Check $delete_ids to be not empty [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms() [ticket/10950] Fix unit tests to reflect desired behaviour [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms() [ticket/10950] Correct comment for the second query. [ticket/10950] Add empty line to make unset() call more visible. [ticket/10950] Select the correct columns in SQL queries. [ticket/10950] Use a variable for the private message id. [ticket/10950] Move array initialisation to the front. [ticket/10950] Remove redundant if statement. [ticket/10950] Fix SQL coding style (indentation) in second SQL query. [ticket/10950] Use proper ' in order to fix comment.
| * | [ticket/10950] Fix grammar in commentsJoas Schilling2012-07-201-3/+3
| | | | | | | | | | | | PHPBB3-10950
| * | [ticket/10950] Delete PMs for users that have not yet read the pmJoas Schilling2012-07-201-32/+44
| | | | | | | | | | | | PHPBB3-10950
| * | [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each userJoas Schilling2012-07-161-5/+18
| | | | | | | | | | | | PHPBB3-10950
| * | [ticket/10950] Use database count() and group by instead of doing that in phpJoas Schilling2012-07-111-11/+5
| | | | | | | | | | | | PHPBB3-10950
| * | [ticket/10950] Check $delete_ids to be not emptyJoas Schilling2012-07-041-19/+22
| | | | | | | | | | | | PHPBB3-10950
| * | [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()Joas Schilling2012-07-041-58/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Get delete_ids, pms of the user as receipt - Get undelivered_msg, pms of the user as sender - Delete undelivered_msg, if there are only NO_BOX, OUTBOX and SENTBOX links - Correct the _new and _unread user values for the receipts - Delete delete_ids, if there are no links to them anymore - Reset _new and _unread values for the user we delete PHPBB3-10950
| * | [ticket/10950] Correct comment for the second query.Andreas Fischer2012-06-231-1/+1
| | | | | | | | | | | | | | | | | | Only undelivered messages are handled. PHPBB3-10950
| * | [ticket/10950] Add empty line to make unset() call more visible.Andreas Fischer2012-06-231-0/+1
| | | | | | | | | | | | PHPBB3-10950
| * | [ticket/10950] Select the correct columns in SQL queries.Andreas Fischer2012-06-231-2/+2
| | | | | | | | | | | | PHPBB3-10950
| * | [ticket/10950] Use a variable for the private message id.Andreas Fischer2012-06-231-6/+8
| | | | | | | | | | | | PHPBB3-10950
| * | [ticket/10950] Move array initialisation to the front.Andreas Fischer2012-06-231-1/+2
| | | | | | | | | | | | PHPBB3-10950
| * | [ticket/10950] Remove redundant if statement.Andreas Fischer2012-06-231-12/+9
| | | | | | | | | | | | | | | | | | We already know author_id and folder_id. PHPBB3-10950
| * | [ticket/10950] Fix SQL coding style (indentation) in second SQL query.Andreas Fischer2012-06-231-1/+1
| | | | | | | | | | | | PHPBB3-10950
| * | [ticket/10950] Use proper ' in order to fix comment.Andreas Fischer2012-06-231-1/+1
| | | | | | | | | | | | PHPBB3-10950
* | | Merge remote-tracking branch 'github-bantu/ticket/10790' into developNils Adermann2012-05-311-6/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10790: [ticket/10790] Remove a (kind of) dead code section from submit_pm().
| * | [ticket/10790] Remove a (kind of) dead code section from submit_pm().Andreas Fischer2012-05-221-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type of $user->data['user_id'] is (almost) guranteed to be integer since session::session_create() casts it to integer. The type of $row['user_id'] is only an integer if the DB driver adjusts the PHP type according to the DB type. This is only done by some of our not-so-popular DB drivers and is not the case for MySQL. As such this comparison is (almost) never true and a PM is also sent to the author itself when it is sent to a group the author is also a member of. Since this behaviour seems to have been accepted by the communty, the dead code is removed and current behaviour is kept. Also, checking this in the loop seems to be a rather bad idea. Introduced by 78b1c4caaa17cc8760b685ad41c19f15f9d89b68. PHPBB3-10790
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-141-0/+160
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10605] Use database updater function _sql() instead of $db->sql_query() [ticket/10605] Put end of array on its own line because start of array is too. [ticket/10605] Add parameter documentation to phpbb_delete_user_pms [ticket/10605] Fix left join usage. [ticket/10605] Add a section for updating from 3.0.10 to schema updates. [ticket/10605] Fix syntax error in database updater. [ticket/10605] Reset user´s pm count to 0 when deleting his PMs [ticket/10605] Split query to be able to use indexes [ticket/10605] Rename $delete_rows to $delete_ids. [ticket/10605] Break long comment into multiple lines 80 chars short. [ticket/10605] Remove unnecessary $delete_ids array. [ticket/10605] Remove unnecessary array_keys calls on $delete_rows. [ticket/10605] Remove unused variable declarations. [ticket/10605] Turn $undelivered_user into a real array of counters. [ticket/10605] Use unset() instead of checking user_id over and over again. [ticket/10605] Prefix function with phpbb_ and use true instead of 1 [ticket/10605] Delete orphan private messages on update [ticket/10605] Check for orphan privmsgs when deleting a user
| * | Merge branch 'ticket/10605' into develop-olympusAndreas Fischer2012-05-141-0/+160
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10605: [ticket/10605] Use database updater function _sql() instead of $db->sql_query() [ticket/10605] Put end of array on its own line because start of array is too. [ticket/10605] Add parameter documentation to phpbb_delete_user_pms [ticket/10605] Fix left join usage. [ticket/10605] Add a section for updating from 3.0.10 to schema updates. [ticket/10605] Fix syntax error in database updater. [ticket/10605] Reset user´s pm count to 0 when deleting his PMs [ticket/10605] Split query to be able to use indexes [ticket/10605] Rename $delete_rows to $delete_ids. [ticket/10605] Break long comment into multiple lines 80 chars short. [ticket/10605] Remove unnecessary $delete_ids array. [ticket/10605] Remove unnecessary array_keys calls on $delete_rows. [ticket/10605] Remove unused variable declarations. [ticket/10605] Turn $undelivered_user into a real array of counters. [ticket/10605] Use unset() instead of checking user_id over and over again. [ticket/10605] Prefix function with phpbb_ and use true instead of 1 [ticket/10605] Delete orphan private messages on update [ticket/10605] Check for orphan privmsgs when deleting a user Conflicts: phpBB/install/database_update.php
| | * | [ticket/10605] Add parameter documentation to phpbb_delete_user_pmsJoas Schilling2012-04-131-0/+4
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Reset user´s pm count to 0 when deleting his PMsJoas Schilling2012-03-271-1/+11
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Split query to be able to use indexesJoas Schilling2012-03-271-3/+31
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Rename $delete_rows to $delete_ids.Andreas Fischer2012-03-271-9/+9
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Break long comment into multiple lines 80 chars short.Andreas Fischer2012-03-271-1/+2
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Remove unnecessary $delete_ids array.Andreas Fischer2012-03-271-5/+3
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Remove unnecessary array_keys calls on $delete_rows.Andreas Fischer2012-03-271-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Remove unused variable declarations.Andreas Fischer2012-03-271-1/+0
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Turn $undelivered_user into a real array of counters.Andreas Fischer2012-03-271-4/+12
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Use unset() instead of checking user_id over and over again.Andreas Fischer2012-03-271-5/+1
| | | | | | | | | | | | | | | | PHPBB3-10605