aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_reports.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3469 from brunoais/ticket/13672Joas Schilling2015-05-281-0/+20
|\ | | | | | | | | | | | | | | | | [ticket/13672] Allow changing the data from the user-submitted report * brunoais/ticket/13672: [ticket/13672] Removed bogus sting concatenation [ticket/13672] BUMP version to 3.1.5-dev [ticket/13672] Allow changing the data from the user-submitted report
| * [ticket/13672] Removed bogus sting concatenationbrunoais2015-05-081-1/+1
| | | | | | | | PHPBB3-13672
| * [ticket/13672] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | PHPBB3-13672
| * [ticket/13672] Allow changing the data from the user-submitted reportbrunoais2015-03-051-0/+20
| | | | | | | | PHPBB3-13672
* | Merge pull request #3468 from brunoais/ticket/13668Joas Schilling2015-05-281-5/+33
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13668] Allow changing the query to obtain the user-submitted report * brunoais/ticket/13668: [ticket/13668] Removed bogus sting concatenation [ticket/13668] BUMP version to 3.1.5-dev [ticket/13668] Allow changing the query to obtain the user-submitted report. [ticket/13668] Convert the mcp report_details query to a built query
| * | [ticket/13668] Removed bogus sting concatenationbrunoais2015-05-081-1/+1
| | | | | | | | | | | | PHPBB3-13668
| * | [ticket/13668] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | PHPBB3-13668
| * | [ticket/13668] Allow changing the query to obtain the user-submitted report.brunoais2015-03-051-0/+19
| |/ | | | | | | PHPBB3-13668
| * [ticket/13668] Convert the mcp report_details query to a built querybrunoais2015-03-051-5/+14
| | | | | | | | PHPBB3-13668
* | [ticket/13819] Add missing sql_freeresult() to files in includes/Marc Alexander2015-05-051-0/+1
|/ | | | PHPBB3-13819
* [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.phpTristan Darricau2014-09-111-1/+1
| | | | PHPBB3-13057
* Merge pull request #2826 from brunoais/ticket/12928Marc Alexander2014-08-301-0/+21
|\ | | | | | | [ticket/12928] core.mcp_reports_gather_query_before
| * [ticket/12928] Update to RC4brunoais2014-08-091-1/+1
| | | | | | | | PHPBB3-12928
| * [ticket/12928] core.mcp_reports_gather_query_beforebrunoais2014-08-081-0/+21
| | | | | | | | | | | | | | Adding the core.mcp_reports_gather_query_before event to mcp backend. PHPBB3-12928
* | [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-161-5/+5
|/ | | | PHPBB3-12990
* [ticket/12612] Prefix check_ids() with phpbb_Joas Schilling2014-06-231-1/+1
| | | | PHPBB3-12612
* [ticket/12612] Prefix mcp_sorting() with phpbb_Joas Schilling2014-06-231-1/+1
| | | | PHPBB3-12612
* [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused globalJoas Schilling2014-06-231-4/+4
| | | | PHPBB3-12612
* [ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacyTristan Darricau2014-06-161-1/+1
| | | | PHPBB3-12721
* [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-271-4/+7
| | | | PHPBB3-12594
* [ticket/12501] Only select attachments uploaded before the post was reported.Cesar G2014-05-051-0/+1
| | | | | | | | | | The post text displayed to the user is the same as when it was reported, even if the post was edited afterwards, thus it follows that the attachments would be the same. This also addresses an issue where the index in the attachment bbcode no longer matches that of its corresponding attachment when new attachments are uploaded after the post is reported. PHPBB3-12501
* [ticket/12501] Parse the reported post message before its attachments.Cesar G2014-05-051-2/+9
| | | | | | | This ensures that the empty lines from attachment.html aren't converted into <br />. PHPBB3-12501
* Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into ↵Nils Adermann2014-05-021-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/12052] Use different visibility when post was editedJoas Schilling2014-04-251-1/+1
| | | | | | | | | | | | ... and needs to be reapproved. PHPBB3-12052
* | [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.Andreas Fischer2014-04-291-4/+2
|/ | | | | | | | | * 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/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-6/+4
|\ | | | | [ticket/11963] Remove stale MCP notifications.
| * [ticket/11963] Don't depend on user_notify flag to delete report notifications.Cesar G2013-11-231-6/+4
| | | | | | | | PHPBB3-11963
* | [ticket/11849] Update more MCP calls to pagination classJoas Schilling2013-12-181-2/+3
|/ | | | PHPBB3-11849
* Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-09-121-0/+1
|\ | | | | | | | | | | | | | | * remotes/upstream/develop-olympus: [ticket/11829] Use report_closed to determine status in MCP report_details Conflicts: phpBB/styles/prosilver/template/mcp_post.html
| * [ticket/11829] Use report_closed to determine status in MCP report_detailsrechosen2013-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | Instead of using post_reported of the post or message_reported of the pm, use report_closed of the report itself to reliably determine whether this particular report is closed or not in the report_details view of the MCP. This fixes a bug where the report_details view would not show that the report shown was closed and display a "Close report" button that had no effect. PHPBB3-11829
* | [ticket/11774] Fix constant to avoid PHP errorsOliver Schramm2013-08-081-1/+1
| | | | | | | | PHPBB3-11774
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-031-38/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-01-151-14/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (37) and others # Via Oleg Pudeyev (24) and others * 'develop' of github.com:phpbb/phpbb3: (179 commits) [ticket/11323] Add tests for inclusion of defined variables [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail. [ticket/11321] Recreate schema files with develop/create_schema_files.php [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31 [ticket/11313] Use correct object el instead of eel in alt_text callback [ticket/11301] Guidelines: Add spaces in front and after the / operator. [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4. [ticket/11311] Include asset core.js in subsilver2 overall_footer.html [ticket/10949] Remove not needed comma [ticket/11309] phpbb_extension_interface::disable_step correct docblock. [ticket/10949] Converted missing code to new JS coding guidelines [ticket/11302] Correctly select first timezone or selected timezone [ticket/11305] Mock container for cache driver in functional create_user() [ticket/11305] Check for $cache being null before using it in db drivers. [ticket/10805] Compare phpbbAlertTimer against null [ticket/11305] Define hook finder as a service on the container. [ticket/11305] Adjust comment. [ticket/11305] Use phpbb_create_default_container. [ticket/11305] Create a normal container during final installation step. [ticket/11305] Retrieve cache driver from container rather than cache service. ... Conflicts: phpBB/install/schemas/firebird_schema.sql phpBB/install/schemas/mssql_schema.sql phpBB/install/schemas/mysql_40_schema.sql phpBB/install/schemas/mysql_41_schema.sql phpBB/install/schemas/oracle_schema.sql phpBB/install/schemas/postgres_schema.sql phpBB/install/schemas/sqlite_schema.sql phpBB/styles/subsilver2/template/overall_footer.html
| | * | [ticket/11171] Cleanup of leftoversBruno Ais2012-12-071-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I didn't notice that there were actually leftovers from the other PR. Anyway, this will remove all the leftovers I noticed from the other PR. PHPBB3-11171
| | * | [ticket/11171] Use the options stored to decide how to show itBruno Ais2012-12-071-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added what's needed so that the post in the report is parsed the same way as it was being parsed when the post was reported PHPBB3-11171
| * | | [ticket/11103] Instantiate $phpbb_notifications as neededNathan Guse2012-12-131-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976 PHPBB3-11103
| * | | [ticket/11103] Create user loader class, update for DICNathan Guse2012-11-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-101-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | [ticket/11103] Use the full class name as the item_type/methodNathan Guse2012-10-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | This is going to require you recreate the db tables. PHPBB3-11103
| * | | [ticket/11103] Remove unnecessary commentsNathan Guse2012-10-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Comments that are not needed because the actions are completely self-explanatory PHPBB3-11103
| * | | [ticket/11103] Finishing up report post/pm and adding report closedNathan Guse2012-10-111-22/+12
| | | | | | | | | | | | | | | | PHPBB3-11103
| * | | [ticket/11103] Working on report notifications (post/pm)Nathan Guse2012-10-091-1/+5
| | | | | | | | | | | | | | | | PHPBB3-11103
* | | | Merge remote-tracking branch 'remotes/phpbb/develop' into ↵Joas Schilling2012-11-101-3/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-merge-develop # By Oleg Pudeyev (45) and others # Via Oleg Pudeyev (42) and others * remotes/phpbb/develop: (289 commits) [ticket/10865] Use code tags for install/database_update.php. [ticket/10865] Should have been a slash. [ticket/10780] Use L_COLON on LDAP page. [ticket/10780] Use L_COLON on search backend ACP pages. [ticket/10780] Use L_COLON for "download all attachments". [ticket/10780] Use colon from language in ucp_pm_compose.php where possible. [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html. [ticket/10780] Replace colon usage in adm template output with {L_COLON} [ticket/10780] Replace colon usage in template output with {L_COLON} [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus] [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [ticket/10172] Show prosilver birthday list even if there are no birthdays. [ticket/11050] make all properties protected in all search backends [ticket/11050] get_common_words() returns empty array for sphinx [ticket/11050] fix tidied search query docblock language [ticket/11050] fix min/max length docblock language [ticket/11050] multi sentences separated by period in docblocks [ticket/11050] fix separated spelling in docblock [ticket/11050] fix split words doc block language [ticket/11050] remove class word from docblocks ... Conflicts: phpBB/install/database_update.php phpBB/install/schemas/mssql_schema.sql phpBB/language/en/acp/permissions_phpbb.php phpBB/styles/prosilver/template/posting_editor.html
| * | | Merge PR #786 branch 'brunoais/ticket/10845' into developOleg Pudeyev2012-11-061-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/10845: [ticket/10845] Removed one empty line that wasn't supposed to be there [ticket/10845] Two of the three colouns were missing in the DB update file [ticket/10845] Remove censor from text [ticket/10845] Now it shows the preview post parsed [ticket/10845] Changed the report system. Now it saves posts with the bbcode Conflicts: phpBB/includes/functions_content.php
| | * | | [ticket/10845] Remove censor from textBruno Ais2012-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to remove the censor, I added a new parameter to generate_text_for_display(), that new parameter is used to tell if the text should be censored or not. Defaults to true. PHPBB3-10845
| | * | | [ticket/10845] Now it shows the preview post parsedBruno Ais2012-05-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this addition, the preview post in the report details now shows with the BBCode parsed. Note: Tested with all BBCodes I have including one personalised to write the <s> BBCode. PHPBB3-10845
| * | | | [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968Joas Schilling2012-10-171-1/+1
| | |/ / | |/| | | | | | | | | | PHPBB3-11023
* | | | [feature/soft-delete] Fix the rest of *_approved and the delete_post unit testJoas Schilling2012-11-101-3/+3
| | | | | | | | | | | | | | | | PHPBB3-9567
* | | | [feature/soft-delete] Lay the groundwork for a soft-delete featureJosh Woody2012-08-291-1/+1
|/ / / | | | | | | | | | | | | | | | So far, I've added no new functionality. The biggest change here is adjusting the DB column names to "visibility" rather than "approved". Some things here are pretty likely to change, for example the name and location of the topic_visibility class. Happy birthday phpBB :) PHPBB3-9657