Update# actually add new user to configured group
This commit is contained in:
parent
211db8e923
commit
b97b8d9e6e
|
|
@ -38,7 +38,8 @@ class Registration extends App {
|
||||||
$c->query('URLGenerator'),
|
$c->query('URLGenerator'),
|
||||||
$c->query('PendingRegist'),
|
$c->query('PendingRegist'),
|
||||||
$c->query('UserManager'),
|
$c->query('UserManager'),
|
||||||
$c->query('Config')
|
$c->query('Config'),
|
||||||
|
$c->query('GroupManager')
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,15 +30,19 @@ class RegisterController extends Controller {
|
||||||
private $pendingreg;
|
private $pendingreg;
|
||||||
private $usermanager;
|
private $usermanager;
|
||||||
private $config;
|
private $config;
|
||||||
|
private $groupmanager;
|
||||||
|
protected $appName;
|
||||||
|
|
||||||
public function __construct($appName, IRequest $request, Wrapper\Mail $mail, IL10N $l10n, $urlgenerator,
|
public function __construct($appName, IRequest $request, Wrapper\Mail $mail, IL10N $l10n, $urlgenerator,
|
||||||
$pendingreg, IUserManager $usermanager, IConfig $config){
|
$pendingreg, IUserManager $usermanager, IConfig $config, IGroupManager $groupmanager){
|
||||||
$this->mail = $mail;
|
$this->mail = $mail;
|
||||||
$this->l10n = $l10n;
|
$this->l10n = $l10n;
|
||||||
$this->urlgenerator = $urlgenerator;
|
$this->urlgenerator = $urlgenerator;
|
||||||
$this->pendingreg = $pendingreg;
|
$this->pendingreg = $pendingreg;
|
||||||
$this->usermanager = $usermanager;
|
$this->usermanager = $usermanager;
|
||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
|
$this->groupmanager = $groupmanager;
|
||||||
|
$this->appName = $appName;
|
||||||
parent::__construct($appName, $request);
|
parent::__construct($appName, $request);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -172,6 +176,21 @@ class RegisterController extends Controller {
|
||||||
'errormsgs' => array($e->message, $username, $password)), 'guest');
|
'errormsgs' => array($e->message, $username, $password)), 'guest');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add user to group
|
||||||
|
$registered_user_group = $this->config->getAppValue($this->appName, 'registered_user_group', 'none');
|
||||||
|
if ( $registered_user_group !== 'none' ) {
|
||||||
|
try {
|
||||||
|
$group = $this->groupmanager->get($registered_user_group);
|
||||||
|
$group->addUser($user);
|
||||||
|
} catch (Exception $e) {
|
||||||
|
return new TemplateResponse('', 'error', array(
|
||||||
|
'errors' => array(array(
|
||||||
|
'error' => $e->message,
|
||||||
|
))
|
||||||
|
), 'error');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Delete pending reg request
|
// Delete pending reg request
|
||||||
$res = $this->pendingreg->delete($email);
|
$res = $this->pendingreg->delete($email);
|
||||||
if ( \OCP\DB::isError($res) ) {
|
if ( \OCP\DB::isError($res) ) {
|
||||||
|
|
|
||||||
|
|
@ -80,6 +80,7 @@ class SettingsController extends Controller {
|
||||||
foreach ( $groups as $group ) {
|
foreach ( $groups as $group ) {
|
||||||
$group_id_list[] = $group->getGid();
|
$group_id_list[] = $group->getGid();
|
||||||
}
|
}
|
||||||
|
// TODO selected
|
||||||
return new TemplateResponse('registration', 'admin', [
|
return new TemplateResponse('registration', 'admin', [
|
||||||
'groups' => $group_id_list
|
'groups' => $group_id_list
|
||||||
], '');
|
], '');
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue