aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_queue.php
Commit message (Collapse)AuthorAgeFilesLines
...
* [ticket/12270] Correct confirm approval message for topicsmarcosbc2014-05-031-5/+17
| | | | | | | | | | | When clicking on approving a topic's first post in the MCP to approve the topic itself, the confirm box dialog asks whether to approve the post or not, instead of asking to approve the topic. To achieve this fix, we just need to count the topics to be approved and check if it's greater than zero. PHPBB3-12270
* [ticket/12270] Correcting to follow phpBB coding standardsmarcosbc2014-05-031-1/+3
| | | | | | | | | I forgot to put the brackets (so it follows the phpBB coding standards) and changed "count($topic_id_list) > 0" to "!empty($topic_id_list)", making the syntax more comprehensible. PHPBB3-12270
* [ticket/12270] Better structured code and no debug error messagemarcosbc2014-05-031-7/+11
| | | | | | | | | | | | A variable (that's not essential) has been removed, two if's has been merged to an if-else control structure. A variable named topic_ids_list has been renamed to topic_id_list to follow the naming standard in that file's code. Also, the debug error has been fixed by changing the topic data key 'username' to 'post_username' in the array_merge function in approve_topics(). PHPBB3-12270
* [ticket/12270] Correct notifications for posts/topics now workingmarcosbc2014-05-031-10/+14
| | | | | | | | | | | | | This patch should finally work correctly: Add the correct notification for post/topic approval without touching templates. This has been done by calling the function approve_topics() inside the approve_posts() function. It's the simplest way for this to work correctly. There may be a call to the DB but other ways (if any), without touching templates, would have been too messy for a function like this. PHPBB3-12270
* [ticket/12270] Reverted templatesmarcosbc2014-05-031-1/+0
| | | | | | | Some lines in the templates were not reverted correctly, so it's done now. PHPBB3-12270
* [ticket/12270] Correct post&topic approval msg, no template changesmarcosbc2014-05-031-2/+9
| | | | | | | | | | | | | | | Following the previous commits, this patch removes the changes done to templates to depend only on code, as suggested by @nickvergessen. All previous modifications have been removed, with another one which checks, in the approve_posts() function, if it is sending a notification for post approval and it is the first one in the topic, send notification indicating that the topic has been approved (and not the post). If not the first post in the topic, do just as before (send a notification about a newly approved post). PHPBB3-12270
* [ticket/12270] Corrent post and topic approval notification messagemarcosbc2014-05-031-0/+1
| | | | | | | | | | | | | | | When you submit a post with needed approval (say user A), and then it gets approved by another user (user B), a subscribed user (user C) to that forum would receive a notification indicating: -A has replied to topic 'New Topic' in the forum 'xyz'. The expected result would be: -A has posted a new topic 'New topic' in the forum 'xyz'. This has fixed by adding a TOPIC_ID template variable to mcp_post.html and, in there, depending if the first post is the topic's first post or not, add a input's with name topic_id_list[] or post_id_list[] and then the respective value (TOPIC_ID or POST_ID). PHPBB3-12270
* Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into ↵Nils Adermann2014-05-021-15/+30
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12371: [ticket/12371] Fix language string [ticket/12371] Fix typos in comment [ticket/12371] Fix redirect link for approve_post and post_in_queue [ticket/12371] Delete the approve_post notification when editing a post [ticket/12371] Fix language in comment [ticket/12371] Reapprove the post and topic again in tests [ticket/12371] Correctly set is_starter when editing first post of the topic [ticket/12371] Add functional tests for reapproving [ticket/12371] Fix query in mcp_sorting() [ticket/12371] Rename disapprove and softdelete tests [ticket/12371] We do not group quote notifications anymore [ticket/12371] Fix SQL query [ticket/11772] Do not send out new topic/post notifications when reapproving [ticket/12052] Use different visibility when post was edited [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method [ticket/12371] Do not add unlimited users as responders [ticket/12371] Do not update the notification entry unneccessarily [ticket/12371] Do not delete post related notifications when a post is deleted [ticket/12371] Allow notification types to redirect to a different url [ticket/12371] Do not group "quote" notifications
| * [ticket/11772] Do not send out new topic/post notifications when reapprovingJoas Schilling2014-04-251-9/+24
| | | | | | | | | | | | | | | | Only add notifications, if we are not reapproving post When the topic was already approved, but was edited and now needs re-approval, we don't want to notify the users again. PHPBB3-11772
| * [ticket/12052] Use different visibility when post was editedJoas Schilling2014-04-251-6/+6
| | | | | | | | | | | | ... and needs to be reapproved. PHPBB3-12052
* | Merge remote-tracking branch 'remotes/Nicofuma/ticket/12445' into ↵Nathaniel Guse2014-05-011-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus # By Nicofuma # Via Nicofuma * remotes/Nicofuma/ticket/12445: [ticket/12445] Change the formulation [ticket/12445] Disapproved post: the name of the poster should be in logs
| * | [ticket/12445] Disapproved post: the name of the poster should be in logsNicofuma2014-04-261-1/+1
| |/ | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12445 PHPBB3-12445
* | [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.Andreas Fischer2014-04-291-3/+0
|/ | | | | | | | | * There MUST NOT be trailing whitespace at the end of lines. * There MUST NOT be whitespace before the first content of a file. * There MUST NOT be whitespace after the last content of a file. * Functions MUST NOT contain multiple empty lines in a row. PHPBB3-12458
* [ticket/11352] Redirect the user back to view*.php after disapprovingJoas Schilling2014-04-071-0/+16
| | | | | | | | The user should be redirected back to: - the topic, if he came from viewtopic and the topic still exists - the forum, if he came from viewtopic, but the topic does not exist anymore PHPBB3-11352
* [ticket/12153] Remove redundant calls to pagination.on_page().Cesar G2014-02-031-1/+0
| | | | PHPBB3-12153
* Merge pull request #1889 from prototech/ticket/11963Nathan Guse2013-12-301-5/+33
|\ | | | | [ticket/11963] Remove stale MCP notifications.
| * [ticket/11963] Fix undefined variable: post_data when mass-approving topics.Cesar G2013-11-231-5/+28
| | | | | | | | PHPBB3-11963
| * [ticket/11963] Delete topic_in_queue notifications in MCP approve_details modeCesar G2013-11-231-0/+5
| | | | | | | | PHPBB3-11963
* | Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into ↵Dhruv2013-12-251-2/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop # By Joas Schilling # Via Joas Schilling * nickvergessen/feature/pagination-class: [ticket/11849] Fix more function calls [ticket/11849] Update more MCP calls to pagination class [ticket/11849] Update some ACP modules with new pagination [ticket/11849] Update rest of the UCP modules [ticket/11849] Update UCP notifications and pm folder [ticket/11849] Update search and memberlist [ticket/11849] Update pagination in viewonline.php [ticket/11849] Remove old pagination test [ticket/11849] Update pagination code in viewtopic.php [ticket/11849] Replace pagination in viewforum.php with class [ticket/11849] Add service definition [ticket/11849] Remove pagination functions [ticket/11849] Test validate_start and on_page [ticket/11849] Move pagination code to class
| * | [ticket/11849] Update more MCP calls to pagination classJoas Schilling2013-12-181-2/+3
| |/ | | | | | | PHPBB3-11849
* | [ticket/11672] Move the reapply_sid() call before meta_refresh() is called.Cesar G2013-11-211-6/+3
| | | | | | | | | | | | | | | | | | The $redirect assignment is not necessary because the variable has already been set near the start of the functions. The redirect value will also never default to index.php because a default value has already been provided when $redirect is initially assigned and passed to the template as a hidden field. PHPBB3-11672
* | [ticket/11672] The json response call exits so the else is not necessary.Cesar G2013-11-191-23/+11
| | | | | | | | PHPBB3-11672
* | [ticket/11672] Clean up the logic in mcp_queue.php.Cesar G2013-11-191-97/+75
| | | | | | | | PHPBB3-11672
* | [ticket/11672] Remove some messages that were missed in mcp_queue.php.Cesar G2013-11-191-2/+10
| | | | | | | | PHPBB3-11672
* | [ticket/11672] Replace sprintf() usage with $user->lang().Cesar G2013-11-191-1/+1
| | | | | | | | PHPBB3-11672
* | [ticket/11672] Removed unnecessary text from alerts.callumacrae2013-11-191-1/+5
|/ | | | | | | Messages like "Return to forum last visited" are entirely unnecessary when using AJAX to delete a post, so this commit removes them. PHPBB3-11672
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-161-11/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Merge remote-tracking branch 'brunoais/ticket/11643' into developJoas Schilling2013-08-031-11/+2
| |\ | | | | | | | | | | | | | | | | | | * brunoais/ticket/11643: [ticket/11643] Use $parse_flags [ticket/11643] Fixed typo in the variable name. [ticket/11643] generate_text_for_display on mcp/mcp_queue.php
| | * [ticket/11643] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11643
| | * [ticket/11643] Fixed typo in the variable name.Bruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11643
| | * [ticket/11643] generate_text_for_display on mcp/mcp_queue.phpBruno Ais2013-07-161-11/+1
| | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11643
* | | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-161-6/+6
| | | | | | | | | | | | PHPBB3-11700
* | | [ticket/11700] Modify all code to use the new interface namesNils Adermann2013-07-141-3/+3
|/ / | | | | | | PHPBB3-11700
* | [ticket/9657] Notifications do not require emails or jabber anymoreJoas Schilling2013-07-111-2/+2
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Use include instead of include_onceJoas Schilling2013-07-111-3/+9
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Use the service instead of the static classJoas Schilling2013-07-111-3/+5
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Add , to last element of an arrayJoas Schilling2013-07-111-6/+6
| | | | | | | | PHPBB3-9657
* | [ticket/9657] DO not use \" inside of double quotesJoas Schilling2013-07-111-4/+4
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Correctly split disapproving from perma deleting postsJoas Schilling2013-03-111-9/+54
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Fix missing global $phpbb_containerJoas Schilling2013-03-111-1/+1
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Remove unused email variablesJoas Schilling2013-03-071-9/+1
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Correctly state when to refresh last/first post info on approvingJoas Schilling2013-03-061-2/+4
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Rebuild notifications in mcp_queue.phpJoas Schilling2013-03-051-85/+72
| | | | | | | | PHPBB3-9657
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-031-3/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * 'develop' of https://github.com/phpbb/phpbb3: (480 commits) [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working [ticket/11386] Forgot to get the migration classes [ticket/11386] Update tests with new constructors for ext.manager/migrator [ticket/11386] Use finder to find migration files [ticket/11363] Fix to make get_module_infos get from all extensions [ticket/11381] Make finder able to search in all available extensions [ticket/11103] Revert whitespace changes [ticket/11103] Few more minor language things [ticket/11103] Don't call generate_board_url many times [ticket/11103] Case time in queries as an int [ticket/11103] Fix effectively installed check [ticket/11103] Remove padding from notifications for now. [ticket/11363] Fix a couple bugs and throw errors if the file not found [ticket/11372] Migrator should only check if effectively installed if not [ticket/11363] Load module info files for extensions too [ticket/11103] Notifications Migration file ... Conflicts: phpBB/includes/functions_posting.php phpBB/includes/mcp/mcp_queue.php phpBB/includes/search/fulltext_mysql.php phpBB/includes/search/fulltext_native.php phpBB/includes/search/fulltext_postgres.php phpBB/includes/search/fulltext_sphinx.php phpBB/install/database_update.php phpBB/styles/prosilver/template/ajax.js
| * [ticket/11103] Mark topic/post subscription notification read when approvedNathan Guse2012-12-151-1/+13
| | | | | | | | PHPBB3-11103
| * [ticket/11103] Instantiate $phpbb_notifications as neededNathan Guse2012-12-131-4/+9
| | | | | | | | | | | | https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976 PHPBB3-11103
| * [ticket/11103] Create user loader class, update for DICNathan Guse2012-11-201-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | 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] Use the full class name as the item_type/methodNathan Guse2012-10-201-12/+16
| | | | | | | | | | | | This is going to require you recreate the db tables. PHPBB3-11103
| * [ticket/11103] Remove unnecessary commentsNathan Guse2012-10-181-11/+0
| | | | | | | | | | | | | | Comments that are not needed because the actions are completely self-explanatory PHPBB3-11103
| * [ticket/11103] Ability to query data before running create_insert_array()Nathan Guse2012-10-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Mark post/topic in queue notifications read when visiting mcp Change post/topic in queue notification url to use MCP. Fix the bug: Approving a topic marks the topic as read, but before the notification is created for the user approving the topic (if they would get a notification that the topic has been made). This causes it to be stuck "unread". PHPBB3-11103