Commit graph

6337 commits

Author SHA1 Message Date
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
Senky
d434672dde [ticket/10967] adding $root_path to posting_get_topic_icons
PHPBB3-10967
2012-10-11 20:38:24 +02:00
Joas Schilling
18f77020e5 [feature/soft-delete] Fix several problems in the forum mcp
PHPBB3-9567
2012-10-10 23:10:46 +02:00
Oleg Pudeyev
f1a692a5f4 Merge PR #956 branch 'dhruvgoel92/ticket/11051' into develop
* dhruvgoel92/ticket/11051:
  [ticket/11051] fix spaces
  [ticket/11051] add common_words variable
  [ticket/11051] remove unnecessary comment
  [ticket/11051] add get_word_len() in sphinx search
  [ticket/11051] use get_word_length in search backend
  [ticket/11051] use get_common_words in search backend
  [ticket/11051] function instead of accessing property in search
  [ticket/11051] add public functions for public properties
2012-10-10 00:39:29 -04:00
Oleg Pudeyev
39258c9452 Merge PR #990 branch 'bantu/ticket/11100' into develop
* bantu/ticket/11100:
  [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.
2012-10-10 00:18:25 -04:00
Oleg Pudeyev
cc5923ea43 Merge PR #993 branch 'bantu/ticket/8713' into develop
* bantu/ticket/8713:
  [ticket/8713] Update untrimmed_variable() doc block.
  [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.
  [ticket/8713] Trim password in auth_db to keep compatibility.
  [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.
  [ticket/8713] Rename untrimed_variable() to untrimmed_variable().
  [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.
  [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.
  [ticket/8713] Always trim array keys.
  [ticket/8713] Add simple (non-nested) test case for untrimmed set_var().
  [ticket/8713] Use \t in double quotes instead of tabs.
  [ticket/8713] Use correct parameter for nested data.
  [ticket/8713] Adjust test method name to other recursive_set_var() tests.
  [ticket/8713] Do not trim login inputs
2012-10-10 00:03:13 -04:00
Nathan Guse
cf810fb775 [ticket/11140] Fix an error from an incorrect variable name
PHPBB3-11140
2012-10-09 22:00:28 -05:00
Joas Schilling
e4c9e55b53 [feature/soft-delete] Fix several issues within submit_post()
- $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
2012-10-09 22:24:06 +02:00
Joas Schilling
fbf85b76c1 [feature/soft-delete] Correctly synchronize the topic_visibility in sync()
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
2012-10-09 15:38:50 +02:00
Joas Schilling
224be5bc4f [feature/soft-delete] Fix sync('topic_visibility')
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
2012-10-09 14:02:42 +02:00
Joas Schilling
7cc8b3eef8 [feature/soft-delete] Correctly update user_posts count
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
2012-10-09 12:23:15 +02:00
Joas Schilling
2841ecc44f [feature/soft-delete] Fix display_user_activity()
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
2012-10-09 12:08:17 +02:00
Joas Schilling
9441774288 [feature/soft-delete] Topic visibility is already synced by sync('topic')
PHPBB3-9567
2012-10-09 11:55:31 +02:00
Joas Schilling
e447a0fa07 [feature/soft-delete] Fix restoring a post via editing
PHPBB3-9567
2012-10-08 23:09:31 +02:00
Joas Schilling
53e01bba19 [feature/soft-delete] Update post counts within set_post_visibility
This is an additional query in some rare cases,
but it makes it much easier to use and understand.
This is mostly a preparation for the restore case.

PHPBB3-9567
2012-10-08 22:47:50 +02:00
Joas Schilling
91398c9e48 [feature/soft-delete] Change order of functions
PHPBB3-9567
2012-10-08 15:03:54 +02:00
Joas Schilling
c525e900d3 [feature/soft-delete] Allow to update multiple posts with set_post_visibility
PHPBB3-9567
2012-10-08 15:01:20 +02:00
Dhruv
305abfde96 [ticket/11051] fix spaces
PHPBB3-11051
2012-10-08 10:58:04 +05:30
Joas Schilling
25804eb8e8 [feature/soft-delete] Add test case for (soft)deleting the only post + fix
PHPBB3-9567
2012-10-06 19:56:52 +02:00
Joas Schilling
44005f338e [feature/soft-delete] Fix delete_post() function
PHPBB3-9567
2012-10-06 16:36:38 +02:00
Joas Schilling
009bd698fb [feature/soft-delete] Update and simplify the logic on delete_post()
Todo: delete_topic case

PHPBB3-9567
2012-10-06 03:59:49 +02:00
Joas Schilling
3088855aa6 [feature/soft-delete] Fix SQL error in search
PHPBB3-9567
2012-10-05 17:46:29 +02:00
Joas Schilling
c22d5bd37c [feature/soft-delete] Clean the code of hide_post() and rely on postcount
PHPBB3-9567
2012-10-05 17:00:14 +02:00
Joas Schilling
05f2366755 [feature/soft-delete] Update docs of can_soft_delete and remove can_restore
PHPBB3-9567
2012-10-05 14:42:11 +02:00
Joas Schilling
526721c7db [feature/soft-delete] Fix set_topic_visibility() so it passes the tests
PHPBB3-9567
2012-10-05 14:26:52 +02:00
Joas Schilling
7969cc7319 [feature/soft-delete] Fix docs of set_post_visibility()
PHPBB3-9567
2012-10-05 13:31:47 +02:00
Joas Schilling
01a78907bd [feature/soft-delete] Update set_topic_visibility() with some more logic
By default, when a soft deleted topic is restored. Only posts that were
approved at the time of soft deleting, are being restored. Same applies to
soft deleting. Only approved posts will be marked as soft deleted.

If you want to update all posts, use the force option.

PHPBB3-9567
2012-10-05 13:30:59 +02:00
Joas Schilling
92c5039af9 [feature/soft-delete] Allow forcing the set_visibility for all posts
PHPBB3-9567
2012-10-05 13:18:06 +02:00
Joas Schilling
42bb97a95c [feature/soft-delete] Make use of set_post_visibility() limits when applicable
PHPBB3-9567
2012-10-05 13:15:55 +02:00
Joas Schilling
bfa6a50a4f [feature/soft-delete] Extend functionality for updating a hole topic
Limit the posts to a certain visibility and deletion time
This allows us to only restore posts, that were approved
when the topic got soft deleted. So previous soft deleted
and unapproved posts are still soft deleted/unapproved

PHPBB3-9567
2012-10-05 13:12:36 +02:00
Joas Schilling
63d11c976b [feature/soft-delete] Fix sync('topic') to match the new logic
This also fixes set_post_visibility()

PHPBB3-9567
2012-10-05 12:39:05 +02:00
Joas Schilling
2a81e4b48e [feature/soft-delete] Fix the get functions to match the new logic
PHPBB3-9567
2012-10-05 12:06:36 +02:00
Dhruv
52b25aaf20 [ticket/11051] add get_word_len() in sphinx search
get_word_len() for sphinx search backend returns false always and
triggers proper error.

PHPBB3-11051
2012-10-04 01:51:57 +05:30
Andreas Fischer
fca0811943 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11112] updating links to phpbb.com to use SSL

Conflicts:
	phpBB/adm/index.php
2012-10-02 17:03:06 +02:00
Joas Schilling
5b64ebc11d [feature/soft-delete] Fix a bug in sync() and set_post_visibility()
PHPBB3-9657
2012-10-02 15:34:18 +02:00
Joas Schilling
a84e4029e4 [feature/soft-delete] Update doc blocks to proper format
PHPBB3-9657
2012-10-02 12:51:59 +02:00
Joas Schilling
b629b2cd95 [feature/soft-delete] Add unit tests for get_global_visibility_sql()
PHPBB3-9657
2012-10-01 22:44:39 +02:00
Joas Schilling
4a65940e62 [feature/soft-delete] Add unit tests for get_forums_visibility_sql()
PHPBB3-9657
2012-10-01 22:14:04 +02: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
Senky
1f89fc9cb6 [ticket/11112] updating links to phpbb.com to use SSL
PHPBB3-11112
2012-10-01 15:38:16 +02:00
Nathan Guse
51862f151d [ticket/8796] Prevent setting post_time greater than time() in markread
PHPBB3-8796
2012-09-30 10:29:43 -05:00
Joas Schilling
e5377e98c7 [feature/soft-delete] Allow setting the visibility change reason
PHPBB3-9657
2012-09-28 16:53:38 +02:00
Joas Schilling
8b2181eb85 [feature/soft-delete] Comment out stuff about f_restore for performance reason
PHPBB3-9657
2012-09-28 16:14:44 +02:00
Andreas Fischer
9a92c45ad3 Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
  [ticket/11021] Fix the language changes that were lost previously
2012-09-15 18:31:13 +02:00
Nathan Guse
9e5505933a [ticket/11021] Fix the language changes that were lost previously
Change U_HOME to U_SITE_HOME

PHPBB3-11021
2012-09-15 11:28:58 -05:00
Andreas Fischer
5dc7aba18f Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
  [ticket/11021] Remove unnecessary line spacing in functions.php
  [ticket/11021] Use L_SITE_HOME instead of L_HOME
  [ticket/11021] Better language strings for site home url/text
  [ticket/11021] subsilver2 support
  [ticket/11021] Add the option to specify a Site home URL and text
2012-09-15 17:48:51 +02:00