1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-09 17:15:19 +02:00

251 Commits

Author SHA1 Message Date
Mark Shaw
4d50a1daa5 [ticket/14680] Fix wrong function name being checked in mcp_queue.
PHPBB3-14680
2016-06-17 11:50:32 -04:00
Marc Alexander
7a6a16e3a5 [ticket/13454] Remove unused variables
This is part 5 and there is more to come.

PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
266576c6a4 [ticket/13454] Remove unused variables
Part 4

PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
f50ba9ab4f [ticket/13454] Remove unused variables
This is part 2 of the pr.

PHPBB3-13454
2016-01-06 13:52:11 +01:00
Andreas Fischer
996886de17 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13831] Store provided reason when deleting from Mod. Queue module.
2015-11-02 21:48:32 +01:00
Andreas Fischer
afbeda7cfd Merge pull request #3983 from prototech/ticket/13831
[ticket/13831] Store provided reason when deleting from Mod. Queue module.

* prototech/ticket/13831:
  [ticket/13831] Store provided reason when deleting from Mod. Queue module.
2015-11-02 21:48:32 +01:00
Tristan Darricau
326ba5325b Merge branch '3.1.x'
* 3.1.x:
  [ticket/9252] Do not try to disapprove a post that was just approved
2015-10-19 14:37:06 +02:00
Tristan Darricau
dfd5ec6835 Merge pull request #3666 from marc1706/ticket/9252
[ticket/9252] Do not try to disapprove a post that was just approved

* marc1706/ticket/9252:
  [ticket/9252] Do not try to disapprove a post that was just approved
2015-10-19 14:36:51 +02:00
Cesar G
f657680311 [ticket/13831] Store provided reason when deleting from Mod. Queue module.
PHPBB3-13831
2015-10-14 19:41:44 -07:00
Marc Alexander
b2e7de0379 Merge branch '3.1.x' 2015-10-09 16:45:07 +02:00
Marc Alexander
8683824ed3 Merge pull request #3934 from Zoddo/ticket/14181
[ticket/14181] Fix empty denial reason if the reason isn't translated
2015-10-09 16:43:53 +02:00
Marc Alexander
f3ea34b311 Merge branch '3.1.x' 2015-10-07 16:50:43 +02:00
Marc Alexander
e5b2dc922f Merge pull request #3615 from rxu/ticket/13846
[ticket/13846] Fix softdelete feature workflow in viewtopic
2015-10-07 16:50:35 +02:00
HB
66397ae0e4 [ticket/14181] Fix empty denial reason if the reason isn't translated
PHPBB3-14181
2015-09-27 17:23:49 +02:00
Zoddo
51600b8f18 [ticket/9485] Add post_id to relevant $phpbb_log->add()
PHPBB3-9485
2015-08-30 22:43:07 +02:00
rxu
0d6c323611 [ticket/13846] Fix MCP to disallow softdeleted posts deletion if not permitted.
PHPBB3-13846
2015-07-30 19:35:01 +07:00
Nicofuma
be0d4e20d4 [ticket/11444] Moving the in-board notifications to a method class
Currently the in-board method for the notifications is hardcoded and
cannot be disabled. This method should be in his own class extending
`phpbb\notification\method\method_interface`.

It also add the possibility, for each method, to be enabled by default (ie:
no entry in the DB => notification enabled).

https://tracker.phpbb.com/browse/PHPBB3-11444
https://tracker.phpbb.com/browse/PHPBB3-11967

PHPBB3-11444
2015-07-13 22:41:13 +02:00
Joas Schilling
03b1b63520 Merge branch '3.1.x' 2015-06-27 11:06:30 +02:00
RMcGirr83
2ec5c5de17 [ticket/13962] MCP Queue dropdown for forum selection
PHPBB3-13962
2015-06-23 13:26:47 -04:00
Marc Alexander
e04f9a2425 [ticket/9252] Do not try to disapprove a post that was just approved
Without this change, posts that are approved by someone right before
another moderator is trying to disapprove a post are actually deleted
instead of disapproved.

PHPBB3-9252
2015-05-30 12:27:00 +02:00
MateBartus
a089ff5eb0 [ticket/13654] Moving reporting into controller
Moving report.php's content into different services and controllers to
better comply with the MVC model.

Also implementing:
 * Replacement for reasons_display()
 * Adding assign_meta_refresh_var() to \controller\helper
 * Adding separate routes for easy configuration
 * Updating unit tests to expect to correct results
 * Add BC tests

PHPBB3-13654
2015-04-16 11:29:11 +02:00
Gaëtan Muller
f6e06da4c6 [ticket/13455] Update calls to request_var()
PHPBB3-13455
2015-02-03 20:50:40 +01:00
Joas Schilling
677ff632c4 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/includes/mcp/mcp_queue.php
2015-02-02 23:27:19 +01:00
Gaëtan Muller
7fc586080b [ticket/13468] Update calls to add_log()
PHPBB3-13468
2015-01-27 18:34:33 +01:00
Wolfsblvt
8a0c227bf9 [ticket/13537] Add core events on mcp_queue for approval and disapproval
Events added for the functions approve_posts(), approve_topics()
and disapprove_posts() in mcp_queue.php, so that you can send notifications
during approval and disapproval.

PHPBB3-13537
2015-01-23 13:01:34 +01:00
Gaëtan Muller
b5544b2f47 [ticket/13450] Type-hint return value of $phpbb_container->get()
PHPBB3-13450
2015-01-12 20:19:07 +01:00
Jakub Senko
e132cdd325 [ticket/13116] Interchange post and topic approval notification
PHPBB3-13116
2014-09-29 21:13:53 +02:00
Tristan Darricau
fe80967535 [ticket/12990] Use the full services name for the notification's types
PHPBB3-12990
2014-08-16 21:46:03 +02:00
Cesar G
43a309ce2b [ticket/12967] Fix undefined variable phpbb_dispatcher error.
PHPBB3-12967
2014-08-11 00:34:12 +02:00
Joas Schilling
96e9d728b9 Merge pull request #2824 from brunoais/ticket/12927
[ticket/12927] core.mcp_queue_get_posts2_query_before

* brunoais/ticket/12927:
  [ticket/12927] core.mcp_queue_get_posts2_query_before
2014-08-08 14:52:35 +02:00
brunoais
0679f76287 [ticket/12927] core.mcp_queue_get_posts2_query_before
Adding the core.mcp_queue_get_posts2_query_before
event to mcp backend.

PHPBB3-12927
2014-08-08 10:52:08 +01:00
brunoais
50cc81afa3 [ticket/12880] core.mcp_queue_!is_topics_query_before
Adding core.mcp_queue_is_topics_query_before

PHPBB3-12880
2014-08-07 18:33:37 +01:00
Joas Schilling
952b4de231 [ticket/12612] Prefix check_ids() with phpbb_
PHPBB3-12612
2014-06-23 23:01:52 +02:00
Joas Schilling
4ac43856f7 [ticket/12612] Prefix mcp_sorting() with phpbb_
PHPBB3-12612
2014-06-23 23:00:13 +02:00
Joas Schilling
c315fc6c89 [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
PHPBB3-12612
2014-06-23 22:58:41 +02:00
Marc Alexander
e8174f3d66 [ticket/12675] Fix code sniffer complaints introduced by recent commits
PHPBB3-12675
2014-06-09 00:51:01 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
marcosbc
36dfb95816 [ticket/12270] Fixed topic counting bug and tests
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
2014-05-24 14:06:23 +02:00
marcosbc
c47c50a29e [ticket/12270] Fixed tests not working
The success message wasn't output correctly if we were approving
topics.

PHPBB3-12270
2014-05-21 00:52:42 +02:00
marcosbc
984ae598be [ticket/12270] No quote notif and double poster notification fix
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
2014-05-10 16:36:11 +02:00
marcosbc
deba1329c8 [ticket/12270] Fixed rebase conflicts
PHPBB3-12270
2014-05-03 21:05:29 +02:00
marcosbc
46c658bdbf [ticket/12270] Correct confirm approval message for topics
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
2014-05-03 20:31:32 +02:00
marcosbc
1fec5e6967 [ticket/12270] Correcting to follow phpBB coding standards
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
2014-05-03 20:31:32 +02:00
marcosbc
f9edc85f82 [ticket/12270] Better structured code and no debug error message
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
2014-05-03 20:31:22 +02:00
marcosbc
158705cf41 [ticket/12270] Correct notifications for posts/topics now working
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
2014-05-03 20:30:51 +02:00
marcosbc
b8477ad3a2 [ticket/12270] Reverted templates
Some lines in the templates  were not reverted correctly,
so it's done now.

PHPBB3-12270
2014-05-03 20:29:28 +02:00
marcosbc
55757ddc65 [ticket/12270] Correct post&topic approval msg, no template changes
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
2014-05-03 20:29:28 +02:00
marcosbc
7446361ad4 [ticket/12270] Corrent post and topic approval notification message
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
2014-05-03 20:29:28 +02:00
Nils Adermann
d36795b844 Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into 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
2014-05-02 12:11:09 +02:00
Nathaniel Guse
5c54cd6a45 Merge remote-tracking branch 'remotes/Nicofuma/ticket/12445' into 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
2014-05-01 21:46:34 -05:00