1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-28 14:08:23 +01:00
Commit Graph

13454 Commits

Author SHA1 Message Date
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
be884b7e29 [ticket/11051] add common_words variable
PHPBB3-11051
2012-10-04 23:32:50 +05:30
Dhruv
67939192ae [ticket/11051] remove unnecessary comment
PHPBB3-11051
2012-10-04 23:17:18 +05:30
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
Andreas Fischer
dbeace22c8 [ticket/11131] Correctly use indefinite article for "warning".
PHPBB3-11131
2012-10-02 14:58:20 +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
Andreas Fischer
0daab4e0ef Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
2012-09-29 00:26:43 +02: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
dc2835af78 [feature/soft-delete] Add columns for soft delete details
PHPBB3-9657
2012-09-28 16:17:21 +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
Joas Schilling
f7a6169184 [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
PHPBB3-11122
2012-09-27 13:22:43 +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
Nathan Guse
480e3daede [ticket/11021] Remove unnecessary line spacing in functions.php
PHPBB3-11021
2012-09-15 10:46:03 -05:00
Nathan Guse
7a47013994 [ticket/11021] Use L_SITE_HOME instead of L_HOME
Check site home url against !== '', not empty

PHPBB3-11021
2012-09-15 10:44:18 -05:00
Nathan Guse
0c56bd45ef [ticket/11021] Better language strings for site home url/text
Correct the logo title to be {L_HOME} if {U_HOME} is used.

Check if the Home text is instead of just equal to false when
outputting it to the template

PHPBB3-11021
2012-09-15 10:28:37 -05:00
Andreas Fischer
f1fb555ea3 Merge remote-tracking branch 'imkingdavid/ticket/11086' into develop
* imkingdavid/ticket/11086:
  [ticket/11086] Move DI processing below $request definition
  [ticket/11086] Fix database_update.php to use Dependency Injection Container
2012-09-14 13:34:23 +02:00
Andreas Fischer
d221f2901a Merge remote-tracking branch 'igorw/ticket/11101' into develop
* igorw/ticket/11101:
  [ticket/11101] Delay execution of container processors
2012-09-14 13:34:21 +02:00
David King
298fa894e7 [ticket/11086] Move DI processing below $request definition
As per PR #991 (ticket/11101).

PHPBB3-11086
2012-09-13 16:56:09 -04:00
David King
503989979a [ticket/11086] Fix database_update.php to use Dependency Injection Container
PHPBB3-11086
2012-09-13 16:44:26 -04:00
Andreas Fischer
238fab3bb9 [ticket/8713] Update untrimmed_variable() doc block.
PHPBB3-8713
2012-09-09 21:53:17 +02:00
Andreas Fischer
73a75fc3d3 [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.
Currently only auth_db is supported there and the password needs to be trimmed
for compatibility because user_password stores

  phpbb_hash(htmlspecialchars(trim($password)))

Setting passwords for other auth modules is currently not supported.

Once setting/changing passwords is supported by auth plugins, the
untrimmed_variable() should be used here and the result should be passed
to the auth plugin.

PHPBB3-8713
2012-09-09 21:10:29 +02:00
David King
8a91598b14 Merge remote-tracking branch 'nickvergessen/ticket/10876' into develop 2012-09-08 15:58:25 -04:00
Andreas Fischer
1e05fd4c62 [ticket/8713] Trim password in auth_db to keep compatibility.
PHPBB3-8713
2012-09-08 15:01:29 +02:00
Andreas Fischer
cc0c378caf [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.
PHPBB3-8713
2012-09-08 14:42:38 +02:00
Igor Wiedler
d543f0ffb1 [ticket/11101] Delay execution of container processors
Also fix the name of the ext processor service.

PHPBB3-11101
2012-09-08 14:41:41 +02:00
Andreas Fischer
f2607fc9e8 [ticket/8713] Rename untrimed_variable() to untrimmed_variable().
PHPBB3-8713
2012-09-08 14:15:56 +02:00
Andreas Fischer
b62c37c579 [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.
PHPBB3-8713
2012-09-08 14:09:12 +02:00
Andreas Fischer
c3e0d1b6d1 [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.
PHPBB3-8713
2012-09-08 14:07:42 +02:00
Andreas Fischer
798033075b [ticket/8713] Always trim array keys.
PHPBB3-8713
2012-09-08 14:07:06 +02:00
Andreas Fischer
552233d8fd [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.
PHPBB3-11100
2012-09-08 01:12:34 +02:00
Nathan Guse
c93b3827dc [ticket/11092] phpbb_gen_download_links strict standards errors
Two strict standards errors in phpbb_gen_download_links

PHPBB3-11092
2012-09-07 11:29:47 -05:00
Nathaniel Guse
fccbf09e4a [ticket/8796] Fix a few issues with the previous commits
Fix an SQL error and the redirect url generated

PHPBB3-8796
2012-09-03 18:58:38 -05:00