github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-05-25 16:19:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow/disallow signup per config

Browse Source
This commit is contained in:
Toby Zerner
2015-08-05 18:19:26 +09:30
parent 023eff95e3
commit 4c06e78b57
4 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/forum/src/components/HeaderSecondary.js
View File

@ -35,13 +35,15 @@ export default class HeaderSecondary extends Component {
items.add('notifications', NotificationsDropdown.component()); items.add('notifications', NotificationsDropdown.component());
items.add('session', SessionDropdown.component()); items.add('session', SessionDropdown.component());
} else { } else {
items.add('signUp', if (app.forum.attribute('allowSignUp')) {
Button.component({ items.add('signUp',
children: app.trans('core.sign_up'), Button.component({
className: 'Button Button--link', children: app.trans('core.sign_up'),
onclick: () => app.modal.show(new SignUpModal()) className: 'Button Button--link',
}) onclick: () => app.modal.show(new SignUpModal())
); })
);
}
items.add('logIn', items.add('logIn',
Button.component({ Button.component({

10
js/forum/src/components/LogInModal.js
View File

@ -71,10 +71,12 @@ export default class LogInModal extends Modal {
<p className="LogInModal-forgotPassword"> <p className="LogInModal-forgotPassword">
<a onclick={this.forgotPassword.bind(this)}>{app.trans('core.forgot_password_link')}</a> <a onclick={this.forgotPassword.bind(this)}>{app.trans('core.forgot_password_link')}</a>
</p> </p>
<p className="LogInModal-signUp"> {app.forum.attribute('allowSignUp') ? (
{app.trans('core.before_sign_up_link')}{' '} <p className="LogInModal-signUp">
<a onclick={this.signUp.bind(this)}>{app.trans('core.sign_up')}</a> {app.trans('core.before_sign_up_link')}{' '}
</p> <a onclick={this.signUp.bind(this)}>{app.trans('core.sign_up')}</a>
</p>
) : ''}
</div> </div>
]; ];
} }

3
src/Api/Serializers/ForumSerializer.php
View File

@ -30,7 +30,8 @@ class ForumSerializer extends Serializer
'welcomeMessage' => Core::config('welcome_message'), 'welcomeMessage' => Core::config('welcome_message'),
'themePrimaryColor' => Core::config('theme_primary_color'), 'themePrimaryColor' => Core::config('theme_primary_color'),
'canView' => $forum->can($this->actor, 'view'), 'canView' => $forum->can($this->actor, 'view'),
'canStartDiscussion' => $forum->can($this->actor, 'startDiscussion') 'canStartDiscussion' => $forum->can($this->actor, 'startDiscussion'),
'allowSignUp' => (bool) Core::config('allow_sign_up')
]; ];
if ($this->actor->isAdmin()) { if ($this->actor->isAdmin()) {

15
src/Core/Users/Commands/RegisterUserHandler.php
View File

@ -3,22 +3,33 @@
use Flarum\Core\Users\User; use Flarum\Core\Users\User;
use Flarum\Events\UserWillBeSaved; use Flarum\Events\UserWillBeSaved;
use Flarum\Core\Support\DispatchesEvents; use Flarum\Core\Support\DispatchesEvents;
use Flarum\Core\Settings\SettingsRepository;
use Flarum\Core\Exceptions\PermissionDeniedException;
class RegisterUserHandler class RegisterUserHandler
{ {
use DispatchesEvents; use DispatchesEvents;
protected $settings;
public function __construct(SettingsRepository $settings)
{
$this->settings = $settings;
}
/** /**
* @param RegisterUser $command * @param RegisterUser $command
* @return User * @return User
*/ */
public function handle(RegisterUser $command) public function handle(RegisterUser $command)
{ {
if (! $this->settings->get('allow_sign_up')) {
throw new PermissionDeniedException;
}
$actor = $command->actor; $actor = $command->actor;
$data = $command->data; $data = $command->data;
// TODO: check whether or not registration is open (config)
$user = User::register( $user = User::register(
array_get($data, 'attributes.username'), array_get($data, 'attributes.username'),
array_get($data, 'attributes.email'), array_get($data, 'attributes.email'),