1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 04:52:36 +01:00

13457 Commits

Author SHA1 Message Date
Oleg Pudeyev
bb09cd9c8e [ticket/10848] Add phpbb_ prefix.
PHPBB3-10848
2012-10-17 15:13:35 -04:00
Oleg Pudeyev
c630480ca1 [ticket/10848] Redirect from adm to installer correctly.
PHPBB3-10848
2012-10-17 15:08:09 -04: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
Oleg Pudeyev
51cd1129be Merge PR #890 branch 'nickvergessen/ticket/10982' into develop
* nickvergessen/ticket/10982:
  [ticket/10982] Correctly check, whether data-overlay is set
  [ticket/10982] Remove overlay on first up/down move of forums in ACP
  [ticket/10982] Allow setting dimming control overlay also as data-overlay
2012-10-16 21:47:13 -04:00
Oleg Pudeyev
d5325e6934 Merge PR #624 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8743] Include poster´s name in mail notifications
2012-10-16 21:21:03 -04:00
Oleg Pudeyev
f0544c884f Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympus
* nickvergessen/ticket/8743:
  [ticket/8743] Include poster´s name in mail notifications
2012-10-16 21:20:58 -04:00
Oleg Pudeyev
ad2feb917f Merge PR #917 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10967] adding $root_path to posting_get_topic_icons
2012-10-16 20:31:03 -04:00
Oleg Pudeyev
bef3f9c7e7 Merge PR #917 branch 'Senky/ticket/10967' into develop-olympus
* Senky/ticket/10967:
  [ticket/10967] adding $root_path to posting_get_topic_icons
2012-10-16 20:30:45 -04:00
Andreas Fischer
60acba81d1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11093] acp_users_overview.html has a wrongly placed </dd>
2012-10-16 14:40:25 +02:00
westr
d376348acf [ticket/11093] acp_users_overview.html has a wrongly placed </dd>
Amended the closing dd tag to the appropriate line: line 145 instead of 141

PHPBB3-11093
2012-10-16 14:39:32 +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
3773cbdf85 [feature/soft-delete] Fix displaying of details module
PHPBB3-9567
2012-10-15 20:51:31 +02:00
Andreas Fischer
72f0e2dd79 Merge remote-tracking branch 'mvinny/ticket/11139' into develop
* mvinny/ticket/11139:
  [ticket/11139] Adding the $phpbb_admin_path variable
  [ticket/11139] Fix fatal error on colour swatch window
2012-10-15 19:49:28 +02:00
Vinny
571d352eed [ticket/11139] Adding the $phpbb_admin_path variable
PHPBB3-11139
2012-10-15 14:32:49 -03: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
a58a76ef5f [feature/soft-delete] Fix permission check in viewtopic.php
PHPBB3-9567
2012-10-15 13:17:05 +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
59281f1b0a Merge PR #973 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
2012-10-10 00:22:38 -04:00
Oleg Pudeyev
68641aab93 Merge PR #973 branch 'bantu/ticket/11069' into develop-olympus
* bantu/ticket/11069:
  [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
2012-10-10 00:22:17 -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
Oleg Pudeyev
3fa0ab7073 Merge PR #1004 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11131] Correctly use indefinite article for "warning".
2012-10-09 19:41:25 -04:00
Oleg Pudeyev
a7893ab299 Merge PR #1004 branch 'bantu/ticket/11131' into develop-olympus
* bantu/ticket/11131:
  [ticket/11131] Correctly use indefinite article for "warning".
2012-10-09 17:42:23 -04: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
70fa983fa8 [feature/soft-delete] Do not allow users to reply to soft deleted topics
We should discuss this in an RFC again, but for now, we just fix the old state.
So moderators can only reply, when the topic is approved.
Also fixes a bug in the visibility check. We need to check the posts visibility
rather then the visibility of the topic. Because when the post is visible, the
topic is as well, but not the other way round.

PHPBB3-9567
2012-10-09 17:38:08 +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
4a3cac0ccb [feature/soft-delete] Fix column name in mcp_sorting()
PHPBB3-9567
2012-10-09 13:20:32 +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
Vinny
5db30e66fd [ticket/11139] Fix fatal error on colour swatch window
PHPBB3-11139
2012-10-09 00:31:59 -03: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
Andreas Fischer
a38de9a232 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11135] Full replacement of credit link to https

Conflicts:
	phpBB/install/convertors/convert_phpbb20.php
2012-10-06 06:15:01 +02:00