1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00

174 Commits

Author SHA1 Message Date
Joas Schilling
ed151cd6aa [ticket/9657] Add , to last element of an array
PHPBB3-9657
2013-07-11 12:12:18 +02:00
Joas Schilling
5b47d73147 [ticket/9657] DO not use \" inside of double quotes
PHPBB3-9657
2013-07-11 12:08:09 +02:00
Joas Schilling
b727e1eeda [ticket/9657] Correctly split disapproving from perma deleting posts
PHPBB3-9657
2013-03-11 16:37:43 +01:00
Joas Schilling
f6dd688e72 [ticket/9657] Fix missing global $phpbb_container
PHPBB3-9657
2013-03-11 12:40:33 +01:00
Joas Schilling
1a49852413 [ticket/9657] Remove unused email variables
PHPBB3-9657
2013-03-07 14:15:14 +01:00
Joas Schilling
e1f5e98fbc [ticket/9657] Correctly state when to refresh last/first post info on approving
PHPBB3-9657
2013-03-06 13:05:15 +01:00
Joas Schilling
a21de6e3f8 [ticket/9657] Rebuild notifications in mcp_queue.php
PHPBB3-9657
2013-03-05 17:09:33 +01:00
Joas Schilling
42c062cedf Merge branch 'develop' of https://github.com/phpbb/phpbb3 into 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
2013-03-03 20:06:52 +01:00
Joas Schilling
4498c5aaeb [feature/soft-delete] Split deleting soft-deleted posts from unapproving posts
PHPBB3-9657
2012-12-20 19:23:26 +01:00
Joas Schilling
24e1881ea1 [feature/soft-delete] Split up on the initial switch instead of a second one
Also fixing some documentation issues

PHPBB3-9657
2012-12-20 15:23:29 +01:00
Joas Schilling
6435b481c5 [feature/soft-delete] Fix a problem with "delete topics" in mcp
PHPBB3-9657
2012-12-18 15:32:13 +01:00
Joas Schilling
63f3cd45bb [feature/soft-delete] Add delete information to approve deatils page
PHPBB3-9657
2012-12-18 15:08:05 +01:00
Nathan Guse
95bd4d73eb [ticket/11103] Mark topic/post subscription notification read when approved
PHPBB3-11103
2012-12-15 10:33:03 -06:00
Nathan Guse
249f3c8885 [ticket/11103] Instantiate $phpbb_notifications as needed
https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976

PHPBB3-11103
2012-12-13 19:19:40 -06: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
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
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
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
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
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
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
Joas Schilling
1943de36f3 [feature/soft-delete] Comment out user_posts update for the moment
It should rely on the permissions of the post not the current user.

PHPBB3-9657
2012-10-01 16:25:05 +02:00
Nathan Guse
7454d5c2d5 [ticket/11103] Topic/Post in queue notification
Also, bug fixes and cleanup

PHPBB3-11103
2012-09-15 14:33:15 -05:00
Nathan Guse
05b573ebf7 [ticket/11103] Topic and post dis/approval notifications
Remove the formatted title function, plaintext is not needed since
email templates are used

Fix a number of bugs.

PHPBB3-11103
2012-09-15 13:51:02 -05:00
Nathan Guse
9c54465a13 [ticket/11103] Starting approve_post type notification
PHPBB3-11103
2012-09-15 12:00:03 -05:00
Nathan Guse
8e977544fb [ticket/11103] Normalization of $phpbb_notifications variable name
Use $phpbb_notifications instead of $notifications everywhere for
consistency and conflict prevention.

PHPBB3-11103
2012-09-14 17:01:08 -05:00
Nathan Guse
ed1ec8e720 [ticket/11103] Add/Update/Mark Read functions accept an array for the type
This saves a lot of code in some areas (where the same data is sent, just
for different types)

Notifications for bookmarks

PHPBB3-11103
2012-09-14 16:54:20 -05:00
Nathan Guse
5502f3c4aa [ticket/11103] Restyle the notification list
Very rough (lots of inline CSS, very ugly)

PHPBB3-11103
2012-09-09 17:20:39 -05:00
Nathan Guse
74e2a8f893 [ticket/11103] Post notifications
PHPBB3-11103
2012-09-09 13:29:47 -05:00
Joas Schilling
c03d692a98 [feature/soft-delete] Fix some more usages of _approved column names
PHPBB3-9657
2012-08-30 22:57:00 +02:00
Joas Schilling
8a036fa3e4 [feature/soft-delete] Update restoring feature to use ajax if requested.
Also fixes the mcp as a hole:
- displayes a success message
- gives a link to the post, if only one was restored

PHPBB3-9657
2012-08-29 18:42:14 +02:00
Joas Schilling
b774c09c7f [feature/soft-delete] Use the variable which holds the correct item status
PHPBB3-9657
2012-08-29 17:50:14 +02:00
Josh Woody
1ab41f8dc6 [feature/soft-delete] Fix some small bugs
To wit: using non-existing constant POST_DELETED in posting.php; first test
post was initially unapproved; soft delete checkbox appeared at post time
Links pointing to the wrong place.

PHPBB3-9657
2012-08-29 17:50:12 +02:00
Josh Woody
f570558a8d [feature/soft-delete] Add a processor for action == restore in mcp_queue.php
Restoring a post within mcp_queue.php didn't do anything before this commit.  Now it does, by way of a function which is very similar to approve_post.

PHPBB3-9657
2012-08-29 17:50:12 +02:00
Josh Woody
a80cfafdd9 [feature/soft-delete] Rename phpbb_visibility class to phpbb_content_visibility
Rename the class to more accurately reflect what it does.

PHPBB3-9657
2012-08-29 17:50:11 +02:00