aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12639] Send a correct IN entry when deleting marked logsTristan Darricau2014-06-021-1/+1
| | | | PHPBB3-12639
* [ticket/12639] Delete entry in admin-log leads to mysql-errorTristan Darricau2014-05-311-2/+0
| | | | PHPBB3-12639
* Merge pull request #2433 from Nicofuma/ticket/10899Joas Schilling2014-05-301-13/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10899] Using Delete All in log viewer with keyword search * Nicofuma/ticket/10899: [ticket/10899] Update doc block [ticket/10899] Use isset($field_value['IN']) [ticket/10899] Add event core.delete_log [ticket/10899] Remove trailing ; [ticket/10899] Fix typo in the class name [ticket/10899] Add unit tests [ticket/10899] Get $phpbb_log from the container [ticket/10899] Remove extra ';' [ticket/10899] Typo [ticket/10899] Refactoring in \phpbb\log\log_interface [ticket/10899] Using Delete All in log viewer with keyword search
| * [ticket/10899] Refactoring in \phpbb\log\log_interfaceTristan Darricau2014-05-101-16/+18
| | | | | | | | PHPBB3-10899
| * [ticket/10899] Using Delete All in log viewer with keyword searchTristan Darricau2014-05-101-2/+8
| | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-10899 PHPBB3-10899
* | Merge pull request #2357 from Nicofuma/ticket/11942Joas Schilling2014-05-301-8/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11942] Delete post/topic reason should be added to logs * Nicofuma/ticket/11942: [ticket/11942] Don't change the reason to '' when hard deleting [ticket/11942] Don't show the checkbox if the post is already soft-deleted [ticket/11942] Remove useless IF in templates [ticket/11942] Apply the modifications to subsilver [ticket/11942] Always display delete reason [ticket/11942] Edits messages [ticket/11942] Change the formulation [ticket/11942] Adding the reason to hard deleted topic/post [ticket/11942] Delete post/topic reason should be added to logs
| * | [ticket/11942] Don't change the reason to '' when hard deletingTristan Darricau2014-05-291-2/+2
| | | | | | | | | | | | PHPBB3-11942
| * | [ticket/11942] Always display delete reasonTristan Darricau2014-05-111-2/+0
| | | | | | | | | | | | PHPBB3-11942
| * | [ticket/11942] Adding the reason to hard deleted topic/postNicofuma2014-05-041-2/+2
| | | | | | | | | | | | PHPBB3-11942
| * | [ticket/11942] Delete post/topic reason should be added to logsNicofuma2014-05-041-2/+2
| |/ | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-11942 PHPBB3-11942
* | [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-2720-94/+140
| | | | | | | | PHPBB3-12594
* | Merge pull request #2487 from n-aleha/ticket/12583Joas Schilling2014-05-261-7/+56
|\ \ | | | | | | | | | | | | | | | | | | | | | [ticket/12583] Add event core.mcp_warn_post_before/after * n-aleha/ticket/12583: [ticket/12583] Redirect only on non-empty $message [ticket/12583] Add event core.mcp_warn_post_before/after
| * | [ticket/12583] Redirect only on non-empty $messagen-aleha2014-05-251-3/+7
| | | | | | | | | | | | PHPBB3-12583
| * | [ticket/12583] Add event core.mcp_warn_post_before/aftern-aleha2014-05-231-5/+50
| | | | | | | | | | | | | | | | | | Event for when warning a user for a post. PHPBB3-12583
* | | Merge pull request #2488 from n-aleha/ticket/12584Joas Schilling2014-05-261-7/+52
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12584] Add event core.mcp_warn_user_before/after * n-aleha/ticket/12584: [ticket/12584] Redirect only on non-empty $message [ticket/12584] Add event core.mcp_warn_user_before/after
| * | | [ticket/12584] Redirect only on non-empty $messagen-aleha2014-05-251-3/+7
| | | | | | | | | | | | | | | | PHPBB3-12584
| * | | [ticket/12584] Add event core.mcp_warn_user_before/aftern-aleha2014-05-251-5/+46
| |/ / | | | | | | | | | | | | | | | Event for when warning a user from MCP. PHPBB3-12584
* | | Merge pull request #2134 from marcosbc/ticket/12270Joas Schilling2014-05-261-24/+58
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12270] Current post and topic approval notification message * marcosbc/ticket/12270: [ticket/12270] Fixed topic counting bug and tests [ticket/12270] Fixed tests not working [ticket/12270] No quote notif and double poster notification fix [ticket/12270] Fixed tests [ticket/12270] Fixed rebase conflicts [ticket/12270] Correct confirm approval message for topics [ticket/12270] Correcting to follow phpBB coding standards [ticket/12270] Better structured code and no debug error message [ticket/12270] Correct notifications for posts/topics now working [ticket/12270] Reverted templates [ticket/12270] Correct post&topic approval msg, no template changes [ticket/12270] Corrent post and topic approval notification message
| * | [ticket/12270] Fixed topic counting bug and testsmarcosbc2014-05-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Topics was not correctly counted (the counter didn't count topics that were re-approved, for example, but only the ones that were unapproved. This should also fix the test that wasn't working correctly. PHPBB3-12270
| * | [ticket/12270] Fixed tests not workingmarcosbc2014-05-211-6/+11
| | | | | | | | | | | | | | | | | | | | | The success message wasn't output correctly if we were approving topics. PHPBB3-12270
| * | [ticket/12270] No quote notif and double poster notification fixmarcosbc2014-05-101-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since a call was added to self::approve_topic(), the poster would get double-notified about it (even if it was later marked as read). Also, when creating a new topic with a quote, it would not be notified, this has also been fixed. PHPBB3-12270
| * | [ticket/12270] Fixed rebase conflictsmarcosbc2014-05-031-21/+14
| | | | | | | | | | | | PHPBB3-12270
| * | [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
* | [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/12273' into ↵Nils Adermann2014-05-021-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12273: (55 commits) [ticket/12273] Move $extension to constructor so the path is always set [ticket/12273] Find events.md relative from the path not the phpbb root [ticket/12273] Do not look in extensions docs/ and tests/ directory [ticket/12273] Also check file for adm "Location:" events [ticket/12273] Do not allow template events in non-html files [ticket/12273] Fix return description [ticket/12273] Update exporter to allow specifying an extension [ticket/12273] Allow to filter events for extensions [ticket/12273] Remove old parameter from function call [ticket/12273] Fix table header for adm events [ticket/12273] Add root path to recursive_event_filter_iterator [ticket/12273] Fix missing classes in export_events_for_wiki.php [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter [ticket/12273] Use RecursiveDirectoryIterator in md_exporter [ticket/12273] Fix doc blocks [ticket/12273] Do not allow 3.1-A1 for template events [ticket/12273] Sort arguments alphabetically before exporting [ticket/12273] Do not allow 3.1-A1 version [ticket/12273] Update since version to 3.1.0-a* style [ticket/12273] Update existing events ...
| * [ticket/12273] Update since version to 3.1.0-a* styleJoas Schilling2014-04-251-1/+1
| | | | | | | | PHPBB3-12273
* | Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into ↵Nils Adermann2014-05-027-24/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-257-15/+17
| |/ | | | | | | | | | | ... 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
* | Merge pull request #2362 from n-aleha/ticket/12186aJoas Schilling2014-04-291-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | [ticket/12186] Move PM reports below post reports while installing for ascraeus * n-aleha/ticket/12186a: [ticket/12186] Move PM reports below post reports while installing for ascraeus [ticket/12186] Move PM reports below post reports while installing
| * \ Merge branch 'ticket/12186' into ticket/12186an-aleha2014-04-271-1/+1
| |\ \ | | |/ | |/|
| | * [ticket/12186] Move PM reports below post reports while installingn-aleha2014-04-231-1/+1
| | | | | | | | | | | | | | | | | | In mcp, move PM reports below post reports while installing. PHPBB3-12186
| | * [ticket/12247] Makes static usernames workMarcos Bjorkelund2014-03-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Relative to the last ticket, this allows static usernames to work correctly (those inserted in the post-column post_username) when sending the e-mail, instead of showing just "Anonymous". PHPBB3-12247
| | * [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()Marcos Bjorkelund2014-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It includes the poster's username in the email notifications of posts that get approved by moderators. This is done by adding the username to every user_notification() function located in /phpBB/includes/mcp/mcp_queue.php. PHPBB3-12247
* | | [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.Andreas Fischer2014-04-294-10/+5
|/ / | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'github-nickvergessen/ticket/12373' into ↵Nils Adermann2014-04-101-4/+13
|\ \ | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12373: [ticket/12373] Add to and from forum_id to LOG_MOVE log entries
| * | [ticket/12373] Add to and from forum_id to LOG_MOVE log entriesJoas Schilling2014-04-081-4/+13
| | | | | | | | | | | | PHPBB3-12373
* | | [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
* | Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeusJoas Schilling2014-04-052-13/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/7707: [ticket/7707] Fix undefined variable: perm_from [ticket/7707] Add comma to last entry of arrays [ticket/7707] Remove unnecessary variables [ticket/7707] Add get_username_string() once more [ticket/7707] Remove unnecessary variables [ticket/7707] Add get_username_string() where possible
| * | [ticket/7707] Remove unnecessary variablesOliver Schramm2014-03-261-9/+0
| | | | | | | | | | | | PHPBB3-7707
| * | [ticket/7707] Add get_username_string() where possibleOliver Schramm2014-03-162-13/+13
| | | | | | | | | | | | PHPBB3-7707