aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | [feature/soft-delete] Fix a problem with "delete topics" in mcpJoas Schilling2012-12-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | | | | | | | | [feature/soft-delete] Add delete information to approve deatils pageJoas Schilling2012-12-181-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | | | | | | | | [feature/soft-delete] Add "Restore" to the mcp forum quick moderationJoas Schilling2012-12-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | | | | | | | | [feature/soft-delete] Fix a problem with the "only softdeleted posts" logicJoas Schilling2012-12-181-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | | | | | | | | Merge remote-tracking branch 'remotes/phpbb/develop' into ↵Joas Schilling2012-11-1081-639/+2456
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | [feature/soft-delete] Link to delete_topics module when the topic is deletedJoas Schilling2012-11-101-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix the rest of *_approved and the delete_post unit testJoas Schilling2012-11-109-34/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Append _approved to *_posts and *_topics column namesJoas Schilling2012-11-096-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Use request object instead of direct accessJoas Schilling2012-11-092-41/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix adding posts to *_posts when restoring soft deletedJoas Schilling2012-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix naming of soft delete (we wont use that in the UI)Joas Schilling2012-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix displaying the button/permissionJoas Schilling2012-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the post is already softdeleted the options should only be available if *_delete is granted. PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Correctly manage soft deleting via MCPJoas Schilling2012-11-021-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Correctly manage softdeleting via posting.phpJoas Schilling2012-11-023-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Invert the logic on confirm boxJoas Schilling2012-11-011-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Permanent delete is now the checkbox rather then softdelete. PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Display message when the posts are already soft deletedJoas Schilling2012-10-311-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix restoring/approving posts with mcp moderationJoas Schilling2012-10-312-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Allow to soft delete posts in the MCP quick moderationJoas Schilling2012-10-302-6/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Correctly increase topics post counts when postingJoas Schilling2012-10-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Allow soft deleting/restoring topics via quickmoderationJoas Schilling2012-10-271-8/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Handle soft deleting via Delete IconJoas Schilling2012-10-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix unit tests for delete_posts()Joas Schilling2012-10-232-17/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix disapproving posts/topics in queueJoas Schilling2012-10-231-19/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix some more topic/post count handlingJoas Schilling2012-10-233-18/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only disapproving in queue is missing. PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix mcp_move_topic() topic/post count handlingJoas Schilling2012-10-231-52/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix forum syncing in ACP and deleting postsJoas Schilling2012-10-222-12/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix submit_post() topic_replies* usageJoas Schilling2012-10-222-12/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix some more uses of topic_replies_realJoas Schilling2012-10-222-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix sync() and some more functions to use the new fieldsJoas Schilling2012-10-223-21/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Correctly calculate the number of replies everywhereJoas Schilling2012-10-223-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Add a function to calculate the actual post/topic countJoas Schilling2012-10-212-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Use correct language when restoring topics in MCPJoas Schilling2012-10-211-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Split unapproved/soft deleted posts from topicsJoas Schilling2012-10-172-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | [feature/soft-delete] Display guest username in topic list instead of "Guest"Joas Schilling2012-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Removed unused old functionsJoas Schilling2012-10-162-364/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Merge approving and restoring topics into one functionJoas Schilling2012-10-161-14/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Merge approving and restoring posts into one functionJoas Schilling2012-10-161-65/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Add module for soft deleted topicsJoas Schilling2012-10-152-16/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | [feature/soft-delete] Add checkbox to restoring posts like on approveJoas Schilling2012-10-151-27/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Turn other functions into methods as wellJoas Schilling2012-10-151-319/+318
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Turn restore_post() into a method and add the docsJoas Schilling2012-10-151-76/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix restoring posts via MCPJoas Schilling2012-10-131-13/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix several problems in the forum mcpJoas Schilling2012-10-102-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix several issues within submit_post()Joas Schilling2012-10-091-200/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - $post_visibility is not boolean, so we need to check for == ITEM_APPROVED - sync() already updates the topic/forum info, so we don't need to do that again - use set_post_visibility() when changing the posts visibility Should be ready for testing. PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Correctly synchronize the topic_visibility in sync()Joas Schilling2012-10-091-24/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also makes sync('topic_visibility') obsolete, but we keep it for now. Also fix a unit test, because ITEM_DELETED overpowers ITEM_UNAPPROVED PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix sync('topic_visibility')Joas Schilling2012-10-091-32/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function can not rely on the first post anymore, as that one could be soft deleted but the topic still has approved replies which are still visible. PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Correctly update user_posts countJoas Schilling2012-10-091-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before soft delete this was much easier, as an unapproved topic could only have one post, because no one could reply to unapproved topics. Now we need to run multiple queries to correctly reduce the post counts. PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix display_user_activity()Joas Schilling2012-10-091-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Logic of $forum_ary was inverted, so if the array is empty, we can skip the queries. We also should not merge passworded forums into the $forum_ary as we removed them from that array right before that. PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Topic visibility is already synced by sync('topic')Joas Schilling2012-10-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
| * | | | | | | | | | | | | [feature/soft-delete] Fix restoring a post via editingJoas Schilling2012-10-082-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567