Commit graph

599 commits

Author SHA1 Message Date
Bruno Ais
73971ef0fa [ticket/11171] Cleanup of leftovers
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
2012-12-07 08:53:17 +00:00
Bruno Ais
83a71a2e77 [ticket/11171] Use the options stored to decide how to show it
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
2012-12-07 08:53:05 +00:00
Oleg Pudeyev
1a411c5658 [ticket/11162] Use correct functions.
PHPBB3-11162
2012-12-05 00:11:14 -05:00
Oleg Pudeyev
abca64b1df [ticket/11162] Add includes.
PHPBB3-11162
2012-12-04 23:37:14 -05:00
Oleg Pudeyev
05053dacd3 [ticket/11162] Fix inaccurately copy pasted comment.
PHPBB3-11162
2012-12-01 23:09:32 -05:00
Oleg Pudeyev
69225bd0a6 [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.
PHPBB3-11162
2012-12-01 23:09:31 -05:00
Nathan Guse
2afb8b9df8 [ticket/11103] Create user loader class, update for DIC
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
2012-11-20 22:54:16 -06:00
Marc Alexander
2265811cd1 Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars
Conflicts:
	phpBB/adm/style/acp_groups.html
	phpBB/adm/style/acp_users_avatar.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_display.php
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/styles/prosilver/template/ucp_avatar_options.html
2012-11-12 14:57:28 +01:00
Nathaniel Guse
68363e362d Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
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
2012-11-10 10:58:44 -06:00
Joas Schilling
948bfcbe77 Merge remote-tracking branch 'remotes/phpbb/develop' into 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
2012-11-10 12:27:19 +01:00
Joas Schilling
6e93fee9d2 [feature/soft-delete] Link to delete_topics module when the topic is deleted
PHPBB3-9567
2012-11-10 11:55:06 +01:00
Joas Schilling
f77a6eaab5 [feature/soft-delete] Fix the rest of *_approved and the delete_post unit test
PHPBB3-9567
2012-11-10 11:24:52 +01:00
Joas Schilling
9c2a58eff4 [feature/soft-delete] Append _approved to *_posts and *_topics column names
PHPBB3-9567
2012-11-09 13:37:53 +01:00
Joas Schilling
8512543cf4 [feature/soft-delete] Use request object instead of direct access
PHPBB3-9567
2012-11-09 12:32:27 +01:00
Oleg Pudeyev
90b458d87e Merge PR #722 branch 'Senky/ticket/9918' into develop
* Senky/ticket/9918:
  [ticket/9918] default values in request_var changed to one string
  [ticket/9918] $redirect variable used from now
2012-11-06 21:10:20 -05:00
Oleg Pudeyev
196ed8ef9f Merge PR #786 branch 'brunoais/ticket/10845' into develop
* 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
2012-11-06 16:23:33 -05:00
Joas Schilling
269330749f [feature/soft-delete] Fix naming of soft delete (we wont use that in the UI)
PHPBB3-9567
2012-11-03 23:37:35 +01:00
Joas Schilling
6999d776d4 [feature/soft-delete] Correctly manage soft deleting via MCP
PHPBB3-9567
2012-11-02 14:23:17 +01:00
Joas Schilling
bed82bf2bd [feature/soft-delete] Invert the logic on confirm box
Permanent delete is now the checkbox rather then softdelete.

PHPBB3-9567
2012-11-01 22:23:35 +01:00
Joas Schilling
8d05dad634 [feature/soft-delete] Display message when the posts are already soft deleted
PHPBB3-9567
2012-10-31 21:28:06 +01:00
Joas Schilling
18dec1026a [feature/soft-delete] Fix restoring/approving posts with mcp moderation
PHPBB3-9567
2012-10-31 14:09:23 +01:00
Joas Schilling
f0e2d21f8c [feature/soft-delete] Allow to soft delete posts in the MCP quick moderation
PHPBB3-9567
2012-10-30 21:46:04 +01:00
Joas Schilling
4a8d38aab1 [feature/soft-delete] Allow soft deleting/restoring topics via quickmoderation
PHPBB3-9567
2012-10-27 17:12:34 +02:00
Joas Schilling
727759c4d8 [feature/soft-delete] Fix disapproving posts/topics in queue
PHPBB3-9567
2012-10-23 22:47:57 +02:00
Joas Schilling
43e6b3a921 [feature/soft-delete] Fix some more topic/post count handling
Only disapproving in queue is missing.

PHPBB3-9567
2012-10-23 16:59:33 +02:00
Joas Schilling
fec72c4b78 [feature/soft-delete] Fix mcp_move_topic() topic/post count handling
PHPBB3-9567
2012-10-23 12:52:31 +02:00
Joas Schilling
5925a17894 [feature/soft-delete] Fix some more uses of topic_replies_real
PHPBB3-9567
2012-10-22 14:55:10 +02:00
Joas Schilling
9945561b4b [feature/soft-delete] Correctly calculate the number of replies everywhere
PHPBB3-9567
2012-10-22 11:14:00 +02:00
Joas Schilling
e7a137820b [feature/soft-delete] Use correct language when restoring topics in MCP
PHPBB3-9567
2012-10-21 22:30:20 +02:00
Nathan Guse
94d682f774 [ticket/11103] Use the full class name as the item_type/method
This is going to require you recreate the db tables.

PHPBB3-11103
2012-10-20 20:58:53 -05:00
Nathan Guse
ae670cc87d [ticket/11103] Remove unnecessary comments
Comments that are not needed because the actions are completely
self-explanatory

PHPBB3-11103
2012-10-18 18:32:13 -05:00
Joas Schilling
ceb5a40eec [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968
PHPBB3-11023
2012-10-17 23:34:37 +02:00
Joas Schilling
0822d2bb61 [feature/soft-delete] Split unapproved/soft deleted posts from topics
If a topic is soft deleted through a moderator, the topic_delete_user is set.
If it is passively soft deleted (f.e. while the only approved post is deleted)
the topic_delete_user is not set. This way, we can distinguish between these
two cases. The same also applies to unapproved posts. So we need to set the
topic_delete_user when an unapproved topic is posted.

Topics that were soft deleted/unapproved by a user (rather then passive) are
going to be displayed in the Topics modules, while all others are in the posts
modules of the MCP queue.

PHPBB3-9567
2012-10-17 15:32:57 +02:00
Joas Schilling
2adb37049e [feature/soft-delete] Display guest username in topic list instead of "Guest"
PHPBB3-9567
2012-10-17 15:23:16 +02:00
Joas Schilling
43d041bdec [feature/soft-delete] Removed unused old functions
PHPBB3-9567
2012-10-16 14:20:23 +02:00
Joas Schilling
722835a4ba [feature/soft-delete] Merge approving and restoring topics into one function
PHPBB3-9567
2012-10-16 14:18:56 +02:00
Joas Schilling
51d54109e0 [feature/soft-delete] Merge approving and restoring posts into one function
PHPBB3-9567
2012-10-16 13:55:22 +02:00
Joas Schilling
33073fafbe [feature/soft-delete] Add module for soft deleted topics
Unapproved/soft deleted posts are posts, that have a different visibility than
the topic. All others will be hidden from the posts list and can be managed
with the topic modules.

PHPBB3-9567
2012-10-15 15:53:32 +02:00
Joas Schilling
b1ce8a8c13 [feature/soft-delete] Add checkbox to restoring posts like on approve
PHPBB3-9567
2012-10-15 15:19:32 +02:00
Joas Schilling
a92927d24c [feature/soft-delete] Turn other functions into methods as well
PHPBB3-9567
2012-10-15 15:05:02 +02:00
Joas Schilling
7c2cc9cfef [feature/soft-delete] Turn restore_post() into a method and add the docs
PHPBB3-9567
2012-10-15 14:02:16 +02:00
Joas Schilling
4bf922fa03 [feature/soft-delete] Fix restoring posts via MCP
PHPBB3-9567
2012-10-13 19:00:08 +02:00
Nathan Guse
3d79ce2803 [ticket/11103] Ability to query data before running create_insert_array()
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
2012-10-12 16:54:42 -05:00
Nathan Guse
1b56a1d6be [ticket/11103] Finishing up report post/pm and adding report closed
PHPBB3-11103
2012-10-11 22:36:48 -05:00
Joas Schilling
18f77020e5 [feature/soft-delete] Fix several problems in the forum mcp
PHPBB3-9567
2012-10-10 23:10:46 +02:00
Nathan Guse
6d53bd4675 [ticket/11103] Finishing up PM Report notifications
PHPBB3-11103
2012-10-09 22:28:41 -05:00
Nathan Guse
9d955507b6 Merge branch 'ticket/11140' of github.com:EXreaction/phpbb3 into ticket/11103 2012-10-09 22:03:18 -05:00
Nathan Guse
b33e527394 [ticket/11103] Working on report notifications (post/pm)
PHPBB3-11103
2012-10-09 22:02:49 -05:00
Nathan Guse
cf810fb775 [ticket/11140] Fix an error from an incorrect variable name
PHPBB3-11140
2012-10-09 22:00:28 -05:00
Nathan Guse
b9bc65eed8 [ticket/11103] Make $phpbb_notifications a global and use it everywhere
Do not use phpbb_container everywhere (makes testing difficult)

PHPBB3-11103
2012-10-04 14:47:13 -05:00